*/
#include "angband.h"
+#include "player-status.h"
+#include "shoot.h"
/*!
* @brief 最初から簡易な名称が明らかになるベースアイテムの判定。 / Certain items, if aware, are known instantly
}
}
- /* Nope */
return (FALSE);
}
#else
#define MAX_SYLLABLES 164 /* Used with scrolls (see below) */
- static cptr syllables[MAX_SYLLABLES] = {
+ static concptr syllables[MAX_SYLLABLES] = {
"a", "ab", "ag", "aks", "ala", "an", "ankh", "app",
"arg", "arze", "ash", "aus", "ban", "bar", "bat", "bek",
"bie", "bin", "bit", "bjor", "blu", "bot", "bu",
*/
static void shuffle_flavors(OBJECT_TYPE_VALUE tval)
{
- IDX *k_idx_list;
- IDX k_idx_list_num = 0;
- IDX i;
+ KIND_OBJECT_IDX *k_idx_list;
+ KIND_OBJECT_IDX k_idx_list_num = 0;
+ KIND_OBJECT_IDX i;
/* Allocate an array for a list of k_idx */
- C_MAKE(k_idx_list, max_k_idx, s16b);
+ C_MAKE(k_idx_list, max_k_idx, KIND_OBJECT_IDX);
/* Search objects with given tval for shuffle */
for (i = 0; i < max_k_idx; i++)
/* Terminate */
*t = '\0';
-
- /* Result */
return (t);
}
* Print a string "s" into a string "t", as if by strcpy(t, s),
* and return a pointer to the terminator.
*/
-static char *object_desc_str(char *t, cptr s)
+static char *object_desc_str(char *t, concptr s)
{
/* Copy the string */
while (*s) *t++ = *s++;
/* Terminate */
*t = '\0';
-
- /* Result */
return (t);
}
/* Terminate */
*t = '\0';
-
- /* Result */
return (t);
}
/* Terminate */
*t = '\0';
-
- /* Result */
return (t);
}
typedef struct flag_insc_table
{
#ifdef JP
- cptr japanese;
+ concptr japanese;
#endif
- cptr english;
+ concptr english;
int flag;
int except_flag;
} flag_insc_table;
{
char *prev_ptr = ptr;
BIT_FLAGS flgs[TR_FLAG_SIZE];
-
- /* Extract the flags */
object_flags(o_ptr, flgs);
/* Remove obvious flags */
*/
static void get_inscription(char *buff, object_type *o_ptr)
{
- cptr insc = quark_str(o_ptr->inscription);
+ concptr insc = quark_str(o_ptr->inscription);
char *ptr = buff;
/* Not fully identified */
{
bool kanji = FALSE;
bool all;
- cptr start = ptr;
+ concptr start = ptr;
/* check for too long inscription */
if (ptr >= buff + MAX_NLEN) continue;
void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode)
{
/* Extract object kind name */
- cptr kindname = k_name + k_info[o_ptr->k_idx].name;
+ concptr kindname = k_name + k_info[o_ptr->k_idx].name;
/* Extract default "base" string */
- cptr basenm = kindname;
+ concptr basenm = kindname;
/* Assume no "modifier" string */
- cptr modstr = "";
+ concptr modstr = "";
int power;
int fire_rate;
bool show_weapon = FALSE;
bool show_armour = FALSE;
- cptr s, s0;
+ concptr s, s0;
char *t;
char p1 = '(', p2 = ')';
sprintf(tmp_val2, " (%s)",r_name + r_ptr->name);
modstr = tmp_val2;
#else
- cptr t = r_name + r_ptr->name;
+ concptr t = r_name + r_ptr->name;
if (!(r_ptr->flags1 & RF1_UNIQUE))
{
#ifdef JP
modstr = r_name + r_ptr->name;
#else
- cptr t = r_name + r_ptr->name;
+ concptr t = r_name + r_ptr->name;
if (!(r_ptr->flags1 & RF1_UNIQUE))
{
/* ランダム・アーティファクト */
if (o_ptr->art_name)
{
- cptr temp = quark_str(o_ptr->art_name);
+ concptr temp = quark_str(o_ptr->art_name);
/* '『' から始まらない伝説のアイテムの名前は最初に付加する */
/* 英語版のセーブファイルから来た 'of XXX' は,「XXXの」と表示する */
{
char k = t[-1];
- /* XXX XXX XXX Mega-Hack */
+ /* Mega-Hack */
/* Hack -- "Cutlass-es" and "Torch-es" */
if ((k == 's') || (k == 'h')) *t++ = 'e';
}
else if (o_ptr->inscription)
{
- cptr str = quark_str(o_ptr->inscription);
+ concptr str = quark_str(o_ptr->inscription);
while(*str)
{
if (*str)
{
/* Find the '#' */
- cptr str_aux = my_strchr(quark_str(o_ptr->inscription), '#');
+ concptr str_aux = my_strchr(quark_str(o_ptr->inscription), '#');
/* Add the false name */
t = object_desc_str(t,"『");
if (o_ptr->inscription && my_strchr(quark_str(o_ptr->inscription), '#'))
{
/* Find the '#' */
- cptr str = my_strchr(quark_str(o_ptr->inscription), '#');
+ concptr str = my_strchr(quark_str(o_ptr->inscription), '#');
/* Add the false name */
t = object_desc_chr(t, ' ');