#include "angband.h"
+#include "world.h"
+#include "player-status.h"
+#include "sort.h"
/*
* Hack -- We will always extract at least one token
* </pre>
*/
-s16b tokenize(char *buf, s16b num, char **tokens, int mode)
+s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode)
{
- int i = 0;
+ s16b i = 0;
char *s = buf;
struct named_num
{
- cptr name; /* The name of this thing */
+ concptr name; /* The name of this thing */
int num; /* A number associated with it */
};
{"GF_ACID", GF_ACID },
{"GF_COLD", GF_COLD },
{"GF_FIRE", GF_FIRE },
- {"GF_PSY_SPEAR", GF_PSY_SPEAR },
+ {"GF_PSY_SPEAR", GF_PSY_SPEAR },
{"GF_MISSILE", GF_MISSILE },
- {"GF_ARROW", GF_ARROW },
+ {"GF_ARROW", GF_ARROW },
{"GF_PLASMA", GF_PLASMA },
- {"GF_WATER", GF_WATER },
+ {"GF_WATER", GF_WATER },
{"GF_LITE", GF_LITE },
{"GF_DARK", GF_DARK },
{"GF_LITE_WEAK", GF_LITE_WEAK },
{"GF_DARK_WEAK", GF_DARK_WEAK },
{"GF_SHARDS", GF_SHARDS },
- {"GF_SOUND", GF_SOUND },
+ {"GF_SOUND", GF_SOUND },
{"GF_CONFUSION", GF_CONFUSION },
- {"GF_FORCE", GF_FORCE },
- {"GF_INERTIA", GF_INERTIA },
+ {"GF_FORCE", GF_FORCE },
+ {"GF_INERTIA", GF_INERTIAL },
{"GF_MANA", GF_MANA },
{"GF_METEOR", GF_METEOR },
{"GF_ICE", GF_ICE },
- {"GF_CHAOS", GF_CHAOS },
+ {"GF_CHAOS", GF_CHAOS },
{"GF_NETHER", GF_NETHER },
{"GF_DISENCHANT", GF_DISENCHANT },
- {"GF_NEXUS", GF_NEXUS },
+ {"GF_NEXUS", GF_NEXUS },
{"GF_TIME", GF_TIME },
{"GF_GRAVITY", GF_GRAVITY },
{"GF_KILL_WALL", GF_KILL_WALL },
{"GF_MAKE_TRAP", GF_MAKE_TRAP },
{"GF_MAKE_TREE", GF_MAKE_TREE },
{"GF_OLD_CLONE", GF_OLD_CLONE },
- {"GF_OLD_POLY", GF_OLD_POLY },
- {"GF_OLD_HEAL", GF_OLD_HEAL },
+ {"GF_OLD_POLY", GF_OLD_POLY },
+ {"GF_OLD_HEAL", GF_OLD_HEAL },
{"GF_OLD_SPEED", GF_OLD_SPEED },
- {"GF_OLD_SLOW", GF_OLD_SLOW },
- {"GF_OLD_CONF", GF_OLD_CONF },
+ {"GF_OLD_SLOW", GF_OLD_SLOW },
+ {"GF_OLD_CONF", GF_OLD_CONF },
{"GF_OLD_SLEEP", GF_OLD_SLEEP },
- {"GF_OLD_DRAIN", GF_OLD_DRAIN },
- {"GF_AWAY_UNDEAD", GF_AWAY_UNDEAD },
+ {"GF_HYPODYNAMIA", GF_HYPODYNAMIA },
+ {"GF_AWAY_UNDEAD", GF_AWAY_UNDEAD },
{"GF_AWAY_EVIL", GF_AWAY_EVIL },
- {"GF_AWAY_ALL", GF_AWAY_ALL },
- {"GF_TURN_UNDEAD", GF_TURN_UNDEAD },
+ {"GF_AWAY_ALL", GF_AWAY_ALL },
+ {"GF_TURN_UNDEAD", GF_TURN_UNDEAD },
{"GF_TURN_EVIL", GF_TURN_EVIL },
- {"GF_TURN_ALL", GF_TURN_ALL },
- {"GF_DISP_UNDEAD", GF_DISP_UNDEAD },
+ {"GF_TURN_ALL", GF_TURN_ALL },
+ {"GF_DISP_UNDEAD", GF_DISP_UNDEAD },
{"GF_DISP_EVIL", GF_DISP_EVIL },
- {"GF_DISP_ALL", GF_DISP_ALL },
+ {"GF_DISP_ALL", GF_DISP_ALL },
{"GF_DISP_DEMON", GF_DISP_DEMON },
- {"GF_DISP_LIVING", GF_DISP_LIVING },
+ {"GF_DISP_LIVING", GF_DISP_LIVING },
{"GF_ROCKET", GF_ROCKET },
{"GF_NUKE", GF_NUKE },
{"GF_MAKE_GLYPH", GF_MAKE_GLYPH },
{"GF_STUN", GF_STUN },
{"GF_HOLY_FIRE", GF_HOLY_FIRE },
{"GF_HELL_FIRE", GF_HELL_FIRE },
- {"GF_DISINTEGRATE", GF_DISINTEGRATE },
- {"GF_CHARM", GF_CHARM },
- {"GF_CONTROL_UNDEAD", GF_CONTROL_UNDEAD },
- {"GF_CONTROL_ANIMAL", GF_CONTROL_ANIMAL },
+ {"GF_DISINTEGRATE", GF_DISINTEGRATE },
+ {"GF_CHARM", GF_CHARM },
+ {"GF_CONTROL_UNDEAD", GF_CONTROL_UNDEAD },
+ {"GF_CONTROL_ANIMAL", GF_CONTROL_ANIMAL },
{"GF_PSI", GF_PSI },
{"GF_PSI_DRAIN", GF_PSI_DRAIN },
- {"GF_TELEKINESIS", GF_TELEKINESIS },
- {"GF_JAM_DOOR", GF_JAM_DOOR },
+ {"GF_TELEKINESIS", GF_TELEKINESIS },
+ {"GF_JAM_DOOR", GF_JAM_DOOR },
{"GF_DOMINATION", GF_DOMINATION },
{"GF_DISP_GOOD", GF_DISP_GOOD },
{"GF_DRAIN_MANA", GF_DRAIN_MANA },
{"GF_MIND_BLAST", GF_MIND_BLAST },
{"GF_BRAIN_SMASH", GF_BRAIN_SMASH },
- {"GF_CAUSE_1", GF_CAUSE_1 },
- {"GF_CAUSE_2", GF_CAUSE_2 },
- {"GF_CAUSE_3", GF_CAUSE_3 },
- {"GF_CAUSE_4", GF_CAUSE_4 },
+ {"GF_CAUSE_1", GF_CAUSE_1 },
+ {"GF_CAUSE_2", GF_CAUSE_2 },
+ {"GF_CAUSE_3", GF_CAUSE_3 },
+ {"GF_CAUSE_4", GF_CAUSE_4 },
{"GF_HAND_DOOM", GF_HAND_DOOM },
- {"GF_CAPTURE", GF_CAPTURE },
+ {"GF_CAPTURE", GF_CAPTURE },
{"GF_ANIM_DEAD", GF_ANIM_DEAD },
- {"GF_CONTROL_LIVING", GF_CONTROL_LIVING },
- {"GF_IDENTIFY", GF_IDENTIFY },
- {"GF_ATTACK", GF_ATTACK },
- {"GF_ENGETSU", GF_ENGETSU },
- {"GF_GENOCIDE", GF_GENOCIDE },
- {"GF_PHOTO", GF_PHOTO },
- {"GF_CONTROL_DEMON", GF_CONTROL_DEMON },
- {"GF_LAVA_FLOW", GF_LAVA_FLOW },
- {"GF_BLOOD_CURSE", GF_BLOOD_CURSE },
- {"GF_SEEKER", GF_SEEKER },
- {"GF_SUPER_RAY", GF_SUPER_RAY },
- {"GF_STAR_HEAL", GF_STAR_HEAL },
- {"GF_WATER_FLOW", GF_WATER_FLOW },
- {"GF_CRUSADE", GF_CRUSADE },
+ {"GF_CHARM_LIVING", GF_CHARM_LIVING },
+ {"GF_IDENTIFY", GF_IDENTIFY },
+ {"GF_ATTACK", GF_ATTACK },
+ {"GF_ENGETSU", GF_ENGETSU },
+ {"GF_GENOCIDE", GF_GENOCIDE },
+ {"GF_PHOTO", GF_PHOTO },
+ {"GF_CONTROL_DEMON", GF_CONTROL_DEMON },
+ {"GF_LAVA_FLOW", GF_LAVA_FLOW },
+ {"GF_BLOOD_CURSE", GF_BLOOD_CURSE },
+ {"GF_SEEKER", GF_SEEKER },
+ {"GF_SUPER_RAY", GF_SUPER_RAY },
+ {"GF_STAR_HEAL", GF_STAR_HEAL },
+ {"GF_WATER_FLOW", GF_WATER_FLOW },
+ {"GF_CRUSADE", GF_CRUSADE },
{"GF_STASIS_EVIL", GF_STASIS_EVIL },
- {"GF_WOUNDS", GF_WOUNDS },
- {NULL, 0 }
+ {"GF_WOUNDS", GF_WOUNDS },
+ {NULL, 0 }
};
*/
errr process_pref_file_command(char *buf)
{
- int i, j, n1, n2;
+ int i, j;
+ TERM_COLOR n1;
+ SYMBOL_CODE n2;
+
char *zz[16];
switch (buf[0])
{
- /* Mega-Hack -- read external player's history file */
- /* Process "H:<history>" */
- case 'H':
- add_history_from_pref_line(buf + 2);
- return 0;
-
- /* Process "R:<num>:<a>/<c>" -- attr/char for monster races */
- case 'R':
- if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
- {
- monster_race *r_ptr;
- i = (huge)strtol(zz[0], NULL, 0);
- n1 = strtol(zz[1], NULL, 0);
- n2 = strtol(zz[2], NULL, 0);
- if (i >= max_r_idx) return 1;
- r_ptr = &r_info[i];
- if (n1 || (!(n2 & 0x80) && n2)) r_ptr->x_attr = n1; /* Allow TERM_DARK text */
- if (n2) r_ptr->x_char = n2;
+ /* Mega-Hack -- read external player's history file */
+ /* Process "H:<history>" */
+ case 'H':
+ add_history_from_pref_line(buf + 2);
return 0;
- }
- break;
- /* Process "K:<num>:<a>/<c>" -- attr/char for object kinds */
- case 'K':
- if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
- {
- object_kind *k_ptr;
- i = (huge)strtol(zz[0], NULL, 0);
- n1 = strtol(zz[1], NULL, 0);
- n2 = strtol(zz[2], NULL, 0);
- if (i >= max_k_idx) return 1;
- k_ptr = &k_info[i];
- if (n1 || (!(n2 & 0x80) && n2)) k_ptr->x_attr = n1; /* Allow TERM_DARK text */
- if (n2) k_ptr->x_char = n2;
- return 0;
- }
- break;
+ /* Process "R:<num>:<a>/<c>" -- attr/char for monster races */
+ case 'R':
+ if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
+ {
+ monster_race *r_ptr;
+ i = (huge)strtol(zz[0], NULL, 0);
+ n1 = (TERM_COLOR)strtol(zz[1], NULL, 0);
+ n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
+ if (i >= max_r_idx) return 1;
+ r_ptr = &r_info[i];
+ if (n1 || (!(n2 & 0x80) && n2)) r_ptr->x_attr = n1; /* Allow TERM_DARK text */
+ if (n2) r_ptr->x_char = n2;
+ return 0;
+ }
+ break;
- /* Process "F:<num>:<a>/<c>" -- attr/char for terrain features */
- /* "F:<num>:<a>/<c>" */
- /* "F:<num>:<a>/<c>:LIT" */
- /* "F:<num>:<a>/<c>:<la>/<lc>:<da>/<dc>" */
- case 'F':
- {
- feature_type *f_ptr;
- int num = tokenize(buf + 2, F_LIT_MAX * 2 + 1, zz, TOKENIZE_CHECKQUOTE);
+ /* Process "K:<num>:<a>/<c>" -- attr/char for object kinds */
+ case 'K':
+ if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
+ {
+ object_kind *k_ptr;
+ i = (huge)strtol(zz[0], NULL, 0);
+ n1 = (TERM_COLOR)strtol(zz[1], NULL, 0);
+ n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
+ if (i >= max_k_idx) return 1;
+ k_ptr = &k_info[i];
+ if (n1 || (!(n2 & 0x80) && n2)) k_ptr->x_attr = n1; /* Allow TERM_DARK text */
+ if (n2) k_ptr->x_char = n2;
+ return 0;
+ }
+ break;
- if ((num != 3) && (num != 4) && (num != F_LIT_MAX * 2 + 1)) return 1;
- else if ((num == 4) && !streq(zz[3], "LIT")) return 1;
+ /* Process "F:<num>:<a>/<c>" -- attr/char for terrain features */
+ /* "F:<num>:<a>/<c>" */
+ /* "F:<num>:<a>/<c>:LIT" */
+ /* "F:<num>:<a>/<c>:<la>/<lc>:<da>/<dc>" */
+ case 'F':
+ {
+ feature_type *f_ptr;
+ int num = tokenize(buf + 2, F_LIT_MAX * 2 + 1, zz, TOKENIZE_CHECKQUOTE);
- i = (huge)strtol(zz[0], NULL, 0);
- if (i >= max_f_idx) return 1;
- f_ptr = &f_info[i];
+ if ((num != 3) && (num != 4) && (num != F_LIT_MAX * 2 + 1)) return 1;
+ else if ((num == 4) && !streq(zz[3], "LIT")) return 1;
- n1 = strtol(zz[1], NULL, 0);
- n2 = strtol(zz[2], NULL, 0);
- if (n1 || (!(n2 & 0x80) && n2)) f_ptr->x_attr[F_LIT_STANDARD] = n1; /* Allow TERM_DARK text */
- if (n2) f_ptr->x_char[F_LIT_STANDARD] = n2;
+ i = (huge)strtol(zz[0], NULL, 0);
+ if (i >= max_f_idx) return 1;
+ f_ptr = &f_info[i];
- /* Mega-hack -- feat supports lighting */
- switch (num)
- {
- /* No lighting support */
- case 3:
- n1 = f_ptr->x_attr[F_LIT_STANDARD];
- n2 = f_ptr->x_char[F_LIT_STANDARD];
- for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
+ n1 = (TERM_COLOR)strtol(zz[1], NULL, 0);
+ n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
+ if (n1 || (!(n2 & 0x80) && n2)) f_ptr->x_attr[F_LIT_STANDARD] = n1; /* Allow TERM_DARK text */
+ if (n2) f_ptr->x_char[F_LIT_STANDARD] = n2;
+
+ /* Mega-hack -- feat supports lighting */
+ switch (num)
{
- f_ptr->x_attr[j] = n1;
- f_ptr->x_char[j] = n2;
- }
- break;
+ /* No lighting support */
+ case 3:
+ n1 = f_ptr->x_attr[F_LIT_STANDARD];
+ n2 = f_ptr->x_char[F_LIT_STANDARD];
+ for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
+ {
+ f_ptr->x_attr[j] = n1;
+ f_ptr->x_char[j] = n2;
+ }
+ break;
- /* Use default lighting */
- case 4:
- apply_default_feat_lighting(f_ptr->x_attr, f_ptr->x_char);
- break;
+ /* Use default lighting */
+ case 4:
+ apply_default_feat_lighting(f_ptr->x_attr, f_ptr->x_char);
+ break;
- /* Use desired lighting */
- case F_LIT_MAX * 2 + 1:
- for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
- {
- n1 = strtol(zz[j * 2 + 1], NULL, 0);
- n2 = strtol(zz[j * 2 + 2], NULL, 0);
- if (n1 || (!(n2 & 0x80) && n2)) f_ptr->x_attr[j] = n1; /* Allow TERM_DARK text */
- if (n2) f_ptr->x_char[j] = n2;
+ /* Use desired lighting */
+ case F_LIT_MAX * 2 + 1:
+ for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
+ {
+ n1 = (TERM_COLOR)strtol(zz[j * 2 + 1], NULL, 0);
+ n2 = (SYMBOL_CODE)strtol(zz[j * 2 + 2], NULL, 0);
+ if (n1 || (!(n2 & 0x80) && n2)) f_ptr->x_attr[j] = n1; /* Allow TERM_DARK text */
+ if (n2) f_ptr->x_char[j] = n2;
+ }
+ break;
}
- break;
}
- }
- return 0;
-
- /* Process "S:<num>:<a>/<c>" -- attr/char for special things */
- case 'S':
- if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
- {
- j = (byte)strtol(zz[0], NULL, 0);
- n1 = strtol(zz[1], NULL, 0);
- n2 = strtol(zz[2], NULL, 0);
- misc_to_attr[j] = n1;
- misc_to_char[j] = n2;
return 0;
- }
- break;
- /* Process "U:<tv>:<a>/<c>" -- attr/char for unaware items */
- case 'U':
- if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
- {
- j = (huge)strtol(zz[0], NULL, 0);
- n1 = strtol(zz[1], NULL, 0);
- n2 = strtol(zz[2], NULL, 0);
- for (i = 1; i < max_k_idx; i++)
+ /* Process "S:<num>:<a>/<c>" -- attr/char for special things */
+ case 'S':
+ if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
+ {
+ j = (byte)strtol(zz[0], NULL, 0);
+ n1 = (TERM_COLOR)strtol(zz[1], NULL, 0);
+ n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
+ misc_to_attr[j] = n1;
+ misc_to_char[j] = n2;
+ return 0;
+ }
+ break;
+
+ /* Process "U:<tv>:<a>/<c>" -- attr/char for unaware items */
+ case 'U':
+ if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
{
- object_kind *k_ptr = &k_info[i];
- if (k_ptr->tval == j)
+ j = (huge)strtol(zz[0], NULL, 0);
+ n1 = (TERM_COLOR)strtol(zz[1], NULL, 0);
+ n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
+ for (i = 1; i < max_k_idx; i++)
{
- if (n1) k_ptr->d_attr = n1;
- if (n2) k_ptr->d_char = n2;
+ object_kind *k_ptr = &k_info[i];
+ if (k_ptr->tval == j)
+ {
+ if (n1) k_ptr->d_attr = n1;
+ if (n2) k_ptr->d_char = n2;
+ }
}
+ return 0;
+ }
+ break;
+
+ /* Process "E:<tv>:<a>" -- attribute for inventory objects */
+ case 'E':
+ if (tokenize(buf+2, 2, zz, TOKENIZE_CHECKQUOTE) == 2)
+ {
+ j = (byte)strtol(zz[0], NULL, 0) % 128;
+ n1 = (TERM_COLOR)strtol(zz[1], NULL, 0);
+ if (n1) tval_to_attr[j] = n1;
+ return 0;
}
+ break;
+
+ /* Process "A:<str>" -- save an "action" for later */
+ case 'A':
+ text_to_ascii(macro__buf, buf+2);
return 0;
- }
- break;
- /* Process "E:<tv>:<a>" -- attribute for inventory objects */
- case 'E':
- if (tokenize(buf+2, 2, zz, TOKENIZE_CHECKQUOTE) == 2)
+ /* Process "P:<str>" -- normal macro */
+ case 'P':
{
- j = (byte)strtol(zz[0], NULL, 0) % 128;
- n1 = strtol(zz[1], NULL, 0);
- if (n1) tval_to_attr[j] = n1;
+ char tmp[1024];
+
+ text_to_ascii(tmp, buf+2);
+ macro_add(tmp, macro__buf);
return 0;
}
- break;
-
- /* Process "A:<str>" -- save an "action" for later */
- case 'A':
- text_to_ascii(macro__buf, buf+2);
- return 0;
- /* Process "P:<str>" -- normal macro */
- case 'P':
- {
- char tmp[1024];
-
- text_to_ascii(tmp, buf+2);
- macro_add(tmp, macro__buf);
- return 0;
- }
-
- /* Process "C:<str>" -- create keymap */
- case 'C':
- {
- int mode;
- char tmp[1024];
-
- if (tokenize(buf+2, 2, zz, TOKENIZE_CHECKQUOTE) != 2) return 1;
+ /* Process "C:<str>" -- create keymap */
+ case 'C':
+ {
+ int mode;
+ char tmp[1024];
- mode = strtol(zz[0], NULL, 0);
- if ((mode < 0) || (mode >= KEYMAP_MODES)) return 1;
+ if (tokenize(buf+2, 2, zz, TOKENIZE_CHECKQUOTE) != 2) return 1;
- text_to_ascii(tmp, zz[1]);
- if (!tmp[0] || tmp[1]) return 1;
- i = (byte)(tmp[0]);
+ mode = strtol(zz[0], NULL, 0);
+ if ((mode < 0) || (mode >= KEYMAP_MODES)) return 1;
- string_free(keymap_act[mode][i]);
+ text_to_ascii(tmp, zz[1]);
+ if (!tmp[0] || tmp[1]) return 1;
+ i = (byte)(tmp[0]);
- keymap_act[mode][i] = string_make(macro__buf);
+ string_free(keymap_act[mode][i]);
- return 0;
- }
+ keymap_act[mode][i] = string_make(macro__buf);
- /* Process "V:<num>:<kv>:<rv>:<gv>:<bv>" -- visual info */
- case 'V':
- if (tokenize(buf+2, 5, zz, TOKENIZE_CHECKQUOTE) == 5)
- {
- i = (byte)strtol(zz[0], NULL, 0);
- angband_color_table[i][0] = (byte)strtol(zz[1], NULL, 0);
- angband_color_table[i][1] = (byte)strtol(zz[2], NULL, 0);
- angband_color_table[i][2] = (byte)strtol(zz[3], NULL, 0);
- angband_color_table[i][3] = (byte)strtol(zz[4], NULL, 0);
return 0;
}
- break;
- /* Process "X:<str>" -- turn option off */
- /* Process "Y:<str>" -- turn option on */
- case 'X':
- case 'Y':
- for (i = 0; option_info[i].o_desc; i++)
- {
- if (option_info[i].o_var &&
- option_info[i].o_text &&
- streq(option_info[i].o_text, buf + 2))
+ /* Process "V:<num>:<kv>:<rv>:<gv>:<bv>" -- visual info */
+ case 'V':
+ if (tokenize(buf+2, 5, zz, TOKENIZE_CHECKQUOTE) == 5)
{
- int os = option_info[i].o_set;
- int ob = option_info[i].o_bit;
+ i = (byte)strtol(zz[0], NULL, 0);
+ angband_color_table[i][0] = (byte)strtol(zz[1], NULL, 0);
+ angband_color_table[i][1] = (byte)strtol(zz[2], NULL, 0);
+ angband_color_table[i][2] = (byte)strtol(zz[3], NULL, 0);
+ angband_color_table[i][3] = (byte)strtol(zz[4], NULL, 0);
+ return 0;
+ }
+ break;
- if ((p_ptr->playing || character_xtra) &&
- (OPT_PAGE_BIRTH == option_info[i].o_page) && !p_ptr->wizard)
+ /* Process "X:<str>" -- turn option off */
+ /* Process "Y:<str>" -- turn option on */
+ case 'X':
+ case 'Y':
+ for (i = 0; option_info[i].o_desc; i++)
+ {
+ if (option_info[i].o_var &&
+ option_info[i].o_text &&
+ streq(option_info[i].o_text, buf + 2))
{
- msg_format(_("初期オプションは変更できません! '%s'", "Birth options can not changed! '%s'"), buf);
- msg_print(NULL);
- return 0;
- }
+ int os = option_info[i].o_set;
+ int ob = option_info[i].o_bit;
- if (buf[0] == 'X')
- {
- /* Clear */
- option_flag[os] &= ~(1L << ob);
- (*option_info[i].o_var) = FALSE;
- }
- else
- {
- /* Set */
- option_flag[os] |= (1L << ob);
- (*option_info[i].o_var) = TRUE;
+ if ((p_ptr->playing || character_xtra) &&
+ (OPT_PAGE_BIRTH == option_info[i].o_page) && !p_ptr->wizard)
+ {
+ msg_format(_("初期オプションは変更できません! '%s'", "Birth options can not changed! '%s'"), buf);
+ msg_print(NULL);
+ return 0;
+ }
+
+ if (buf[0] == 'X')
+ {
+ /* Clear */
+ option_flag[os] &= ~(1L << ob);
+ (*option_info[i].o_var) = FALSE;
+ }
+ else
+ {
+ /* Set */
+ option_flag[os] |= (1L << ob);
+ (*option_info[i].o_var) = TRUE;
+ }
+ return 0;
}
- return 0;
}
- }
- /* don't know that option. ignore it.*/
- msg_format(_("オプションの名前が正しくありません： %s", "Ignored invalid option: %s"), buf);
- msg_print(NULL);
- return 0;
+ /* don't know that option. ignore it.*/
+ msg_format(_("オプションの名前が正しくありません： %s", "Ignored invalid option: %s"), buf);
+ msg_print(NULL);
+ return 0;
- /* Process "Z:<type>:<str>" -- set spell color */
- case 'Z':
- {
- /* Find the colon */
- char *t = my_strchr(buf + 2, ':');
+ /* Process "Z:<type>:<str>" -- set spell color */
+ case 'Z':
+ {
+ /* Find the colon */
+ char *t = my_strchr(buf + 2, ':');
- /* Oops */
- if (!t) return 1;
+ if (!t) return 1;
- /* Nuke the colon */
- *(t++) = '\0';
+ /* Nuke the colon */
+ *(t++) = '\0';
- for (i = 0; gf_desc[i].name; i++)
- {
- /* Match this type */
- if (streq(gf_desc[i].name, buf + 2))
+ for (i = 0; gf_desc[i].name; i++)
{
- /* Remember this color set */
- gf_color[gf_desc[i].num] = quark_add(t);
+ /* Match this type */
+ if (streq(gf_desc[i].name, buf + 2))
+ {
+ /* Remember this color set */
+ gf_color[gf_desc[i].num] = quark_add(t);
- /* Success */
- return 0;
+ /* Success */
+ return 0;
+ }
}
- }
-
- break;
- }
- /* Initialize macro trigger names and a template */
- /* Process "T:<trigger>:<keycode>:<shift-keycode>" */
- /* Process "T:<template>:<modifier chr>:<modifier name>:..." */
- case 'T':
- {
- int tok = tokenize(buf+2, 2+MAX_MACRO_MOD, zz, 0);
+ break;
+ }
+ /* Initialize macro trigger names and a template */
+ /* Process "T:<trigger>:<keycode>:<shift-keycode>" */
/* Process "T:<template>:<modifier chr>:<modifier name>:..." */
- if (tok >= 4)
+ case 'T':
{
- int i;
- int num;
+ int tok = tokenize(buf+2, 2+MAX_MACRO_MOD, zz, 0);
- if (macro_template != NULL)
+ /* Process "T:<template>:<modifier chr>:<modifier name>:..." */
+ if (tok >= 4)
{
- num = strlen(macro_modifier_chr);
+ int num;
- /* Kill the template string */
- string_free(macro_template);
- macro_template = NULL;
+ if (macro_template != NULL)
+ {
+ num = strlen(macro_modifier_chr);
- /* Kill flag characters of modifier keys */
- string_free(macro_modifier_chr);
+ /* Kill the template string */
+ string_free(macro_template);
+ macro_template = NULL;
- /* Kill corresponding modifier names */
- for (i = 0; i < num; i++)
- {
- string_free(macro_modifier_name[i]);
- }
+ /* Kill flag characters of modifier keys */
+ string_free(macro_modifier_chr);
- /* Kill trigger name strings */
- for (i = 0; i < max_macrotrigger; i++)
- {
- string_free(macro_trigger_name[i]);
- string_free(macro_trigger_keycode[0][i]);
- string_free(macro_trigger_keycode[1][i]);
- }
+ /* Kill corresponding modifier names */
+ for (i = 0; i < num; i++)
+ {
+ string_free(macro_modifier_name[i]);
+ }
- max_macrotrigger = 0;
- }
+ /* Kill trigger name strings */
+ for (i = 0; i < max_macrotrigger; i++)
+ {
+ string_free(macro_trigger_name[i]);
+ string_free(macro_trigger_keycode[0][i]);
+ string_free(macro_trigger_keycode[1][i]);
+ }
- if (*zz[0] == '\0') return 0; /* clear template */
+ max_macrotrigger = 0;
+ }
- /* Number of modifier flags */
- num = strlen(zz[1]);
+ if (*zz[0] == '\0') return 0; /* clear template */
- /* Limit the number */
- num = MIN(MAX_MACRO_MOD, num);
+ /* Number of modifier flags */
+ num = strlen(zz[1]);
- /* Stop if number of modifier is not correct */
- if (2 + num != tok) return 1;
+ /* Limit the number */
+ num = MIN(MAX_MACRO_MOD, num);
- /* Get a template string */
- macro_template = string_make(zz[0]);
+ /* Stop if number of modifier is not correct */
+ if (2 + num != tok) return 1;
- /* Get flag characters of modifier keys */
- macro_modifier_chr = string_make(zz[1]);
+ /* Get a template string */
+ macro_template = string_make(zz[0]);
- /* Get corresponding modifier names */
- for (i = 0; i < num; i++)
- {
- macro_modifier_name[i] = string_make(zz[2+i]);
- }
- }
+ /* Get flag characters of modifier keys */
+ macro_modifier_chr = string_make(zz[1]);
- /* Process "T:<trigger>:<keycode>:<shift-keycode>" */
- else if (tok >= 2)
- {
- char buf[1024];
- int m;
- char *t, *s;
- if (max_macrotrigger >= MAX_MACRO_TRIG)
- {
- msg_print(_("マクロトリガーの設定が多すぎます!", "Too many macro triggers!"));
- return 1;
+ /* Get corresponding modifier names */
+ for (i = 0; i < num; i++)
+ {
+ macro_modifier_name[i] = string_make(zz[2+i]);
+ }
}
- m = max_macrotrigger;
- max_macrotrigger++;
- /* Take into account the escape character */
- t = buf;
- s = zz[0];
- while (*s)
+ /* Process "T:<trigger>:<keycode>:<shift-keycode>" */
+ else if (tok >= 2)
{
- if ('\\' == *s) s++;
- *t++ = *s++;
- }
- *t = '\0';
+ char buf_aux[1024];
+ int m;
+ char *t, *s;
+ if (max_macrotrigger >= MAX_MACRO_TRIG)
+ {
+ msg_print(_("マクロトリガーの設定が多すぎます!", "Too many macro triggers!"));
+ return 1;
+ }
+ m = max_macrotrigger;
+ max_macrotrigger++;
- /* Get a trigger name */
- macro_trigger_name[m] = string_make(buf);
+ /* Take into account the escape character */
+ t = buf_aux;
+ s = zz[0];
+ while (*s)
+ {
+ if ('\\' == *s) s++;
+ *t++ = *s++;
+ }
+ *t = '\0';
- /* Get the corresponding key code */
- macro_trigger_keycode[0][m] = string_make(zz[1]);
+ /* Get a trigger name */
+ macro_trigger_name[m] = string_make(buf_aux);
- if (tok == 3)
- {
- /* Key code of a combination of it with the shift key */
- macro_trigger_keycode[1][m] = string_make(zz[2]);
- }
- else
- {
- macro_trigger_keycode[1][m] = string_make(zz[1]);
+ /* Get the corresponding key code */
+ macro_trigger_keycode[0][m] = string_make(zz[1]);
+
+ if (tok == 3)
+ {
+ /* Key code of a combination of it with the shift key */
+ macro_trigger_keycode[1][m] = string_make(zz[2]);
+ }
+ else
+ {
+ macro_trigger_keycode[1][m] = string_make(zz[1]);
+ }
}
- }
- /* No error */
- return 0;
- }
+ /* No error */
+ return 0;
+ }
}
/* Failure */
* result
* </pre>
*/
-cptr process_pref_file_expr(char **sp, char *fp)
+concptr process_pref_file_expr(char **sp, char *fp)
{
- cptr v;
+ concptr v;
char *b;
char *s;
char b2 = ']';
char f = ' ';
- static char tmp[10];
+ static char tmp[16];
/* Initial */
s = (*sp);
/* Analyze */
if (*s == b1)
{
- const char *p;
- const char *t;
+ concptr p;
+ concptr t;
/* Skip b1 */
s++;
/* First */
t = process_pref_file_expr(&s, &f);
- /* Oops */
if (!*t)
{
/* Nothing */
}
}
- /* Oops */
else
{
while (*s && (f != b2))
{
static char tmp_player_name[32];
char *pn, *tpn;
- for (pn = player_name, tpn = tmp_player_name; *pn; pn++, tpn++)
+ for (pn = p_ptr->name, tpn = tmp_player_name; *pn; pn++, tpn++)
{
#ifdef JP
if (iskanji(*pn))
/* Save */
(*fp) = f;
-
- /* Save */
(*sp) = s;
-
- /* Result */
return (v);
}
* result
* </pre>
*/
-static errr process_pref_file_aux(cptr name, int preftype)
+static errr process_pref_file_aux(concptr name, int preftype)
{
FILE *fp;
if ((buf[0] == '?') && (buf[1] == ':'))
{
char f;
- cptr v;
+ concptr v;
char *s;
/* Start */
/* Set flag */
bypass = (streq(v, "0") ? TRUE : FALSE);
-
- /* Continue */
continue;
}
/* Set back depth level */
depth_count--;
-
- /* Continue */
continue;
}
msg_format(_("('%s'を解析中)", "Parsing '%s'"), old);
msg_print(NULL);
}
-
- /* Close the file */
my_fclose(fp);
-
- /* Result */
return (err);
}
* allow conditional evaluation and filename inclusion.
* </pre>
*/
-errr process_pref_file(cptr name)
+errr process_pref_file(concptr name)
{
char buf[1024];
/* Use that value */
check_load_value = value;
- /* Done */
break;
}
-
- /* Close the file */
my_fclose(fp);
#endif
#define ENTRY_SKILL_SEARCH 25
#define ENTRY_SKILL_DISARM 26
#define ENTRY_SKILL_DEVICE 27
+#define ENTRY_SKILL_DIG 45
+
+
#define ENTRY_BLOWS 28
#define ENTRY_SHOTS 29
#define ENTRY_AVG_DMG 30
{29, 7, 21, "属性"},
{29, 14, 21, "強化度"},
{29, 16, 21, "次レベル"},
+ {53, 19, -1, "掘削 :" },
};
#else
= {
{29, 7, 21, "Align"},
{29, 14, 21, "Construction"},
{29, 16, 21, "Const to Adv"},
+ {53, 19, -1, "Digging :" },
};
#endif
* @param attr 項目表示の色
* @return なし
*/
-static void display_player_one_line(int entry, cptr val, byte attr)
+static void display_player_one_line(int entry, concptr val, TERM_COLOR attr)
{
char buf[40];
int row = disp_player_line[entry].row;
int col = disp_player_line[entry].col;
int len = disp_player_line[entry].len;
- cptr head = disp_player_line[entry].header;
+ concptr head = disp_player_line[entry].header;
int head_len = strlen(head);
static void display_player_melee_bonus(int hand, int hand_entry)
{
char buf[160];
- int show_tohit = p_ptr->dis_to_h[hand];
- int show_todam = p_ptr->dis_to_d[hand];
+ HIT_PROB show_tohit = p_ptr->dis_to_h[hand];
+ HIT_POINT show_todam = p_ptr->dis_to_d[hand];
object_type *o_ptr = &inventory[INVEN_RARM + hand];
/* Hack -- add in weapon info if known */
show_tohit += p_ptr->skill_thn / BTH_PLUS_ADJ;
/* Melee attacks */
- sprintf(buf, "(%+d,%+d)", show_tohit, show_todam);
+ sprintf(buf, "(%+d,%+d)", (int)show_tohit, (int)show_todam);
/* Dump the bonuses to hit/dam */
if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))
char buf[160];
/* Base skill */
- int show_tohit = p_ptr->dis_to_h_b;
- int show_todam = 0;
+ HIT_PROB show_tohit = p_ptr->dis_to_h_b;
+ HIT_POINT show_todam = 0;
/* Range weapon */
object_type *o_ptr = &inventory[INVEN_BOW];
/* Dump speed */
{
int tmp_speed = 0;
- byte attr;
+ TERM_COLOR attr;
int i;
i = p_ptr->pspeed-110;
/*
* Hack -- pass color info around this file
*/
-static byte likert_color = TERM_WHITE;
+static TERM_COLOR likert_color = TERM_WHITE;
/*!
* @brief 技能ランクの表示基準を定める
* Returns a "rating" of x depending on y
* @param x 技能値
- * @param y 技能値に対するランク基準比
+ * @param y 技能値に対するランク基準比
* @return なし
*/
-static cptr likert(int x, int y)
+static concptr likert(int x, int y)
{
- static char dummy[20] = "";
+ static char dummy[20] = "", dummy2[20] = "";
+ memset(dummy, 0, strlen(dummy));
+ memset(dummy2, 0, strlen(dummy2));
/* Paranoia */
if (y <= 0) y = 1;
+ if(show_actual_value)
+ {
+ sprintf(dummy, "%3d-", x);
+ }
+
/* Negative value */
if (x < 0)
{
likert_color = TERM_L_DARK;
- return _("最低", "Very Bad");
- }
-
- /* Analyze the value */
- switch ((x / y))
- {
- case 0:
- case 1:
- likert_color = TERM_RED;
- return _("悪い", "Bad");
-
- case 2:
- likert_color = TERM_L_RED;
- return _("劣る", "Poor");
-
- case 3:
- case 4:
- likert_color = TERM_ORANGE;
- return _("普通", "Fair");
-
- case 5:
- likert_color = TERM_YELLOW;
- return _("良い", "Good");
-
- case 6:
- likert_color = TERM_YELLOW;
- return _("大変良い", "Very Good");
-
- case 7:
- case 8:
- likert_color = TERM_L_GREEN;
- return _("卓越", "Excellent");
-
- case 9:
- case 10:
- case 11:
- case 12:
- case 13:
- likert_color = TERM_GREEN;
- return _("超越", "Superb");
-
- case 14:
- case 15:
- case 16:
- case 17:
- likert_color = TERM_BLUE;
- return _("英雄的", "Heroic");
+ strcat(dummy, _("最低", "Very Bad"));
+ }
+ else
+ {
- default:
- likert_color = TERM_VIOLET;
- sprintf(dummy, _("伝説的[%d]", "Legendary[%d]"), (int)((((x / y) - 17) * 5) / 2));
- return dummy;
+ /* Analyze the value */
+ switch ((x / y))
+ {
+ case 0:
+ case 1:
+ likert_color = TERM_RED;
+ strcat(dummy, _("悪い", "Bad"));
+ break;
+ case 2:
+ likert_color = TERM_L_RED;
+ strcat(dummy, _("劣る", "Poor"));
+ break;
+
+ case 3:
+ case 4:
+ likert_color = TERM_ORANGE;
+ strcat(dummy, _("普通", "Fair"));
+ break;
+
+ case 5:
+ likert_color = TERM_YELLOW;
+ strcat(dummy, _("良い", "Good"));
+ break;
+
+ case 6:
+ likert_color = TERM_YELLOW;
+ strcat(dummy, _("大変良い", "Very Good"));
+ break;
+
+ case 7:
+ case 8:
+ likert_color = TERM_L_GREEN;
+ strcat(dummy, _("卓越", "Excellent"));
+ break;
+
+ case 9:
+ case 10:
+ case 11:
+ case 12:
+ case 13:
+ likert_color = TERM_GREEN;
+ strcat(dummy, _("超越", "Superb"));
+ break;
+
+ case 14:
+ case 15:
+ case 16:
+ case 17:
+ likert_color = TERM_BLUE;
+ strcat(dummy, _("英雄的", "Heroic"));
+ break;
+
+ default:
+ likert_color = TERM_VIOLET;
+ sprintf(dummy2, _("伝説的[%d]", "Legendary[%d]"),
+ (int)((((x / y) - 17) * 5) / 2));
+ strcat(dummy, dummy2);
+
+ break;
+ }
}
+ return dummy;
+
}
int tmp, damage[2], to_h[2], blows1, blows2, i, basedam;
int xthn, xthb, xfos, xsrh;
int xdis, xdev, xsav, xstl;
- cptr desc;
+ int xdig;
+ concptr desc;
int muta_att = 0;
- u32b flgs[TR_FLAG_SIZE];
+ BIT_FLAGS flgs[TR_FLAG_SIZE];
int shots, shot_frac;
bool dokubari;
/* If the player is wielding one? */
if (o_ptr->k_idx)
{
- s16b energy_fire = bow_energy(o_ptr->sval);
+ ENERGY energy_fire = bow_energy(o_ptr->sval);
/* Calculate shots per round */
shots = p_ptr->num_fire * 100;
damage[i] = p_ptr->dis_to_d[i] * 100;
if (((p_ptr->pclass == CLASS_MONK) || (p_ptr->pclass == CLASS_FORCETRAINER)) && (empty_hands(TRUE) & EMPTY_HAND_RARM))
{
- int level = p_ptr->lev;
+ PLAYER_LEVEL level = p_ptr->lev;
if (i)
{
damage[i] = 0;
xstl = p_ptr->skill_stl;
xsrh = p_ptr->skill_srh;
xfos = p_ptr->skill_fos;
+ xdig = p_ptr->skill_dig;
desc = likert(xthn, 12);
desc = likert(xdev, 6);
display_player_one_line(ENTRY_SKILL_DEVICE, desc, likert_color);
+ desc = likert(xdev, 6);
+ display_player_one_line(ENTRY_SKILL_DEVICE, desc, likert_color);
+
+ desc = likert(xdig, 4);
+ display_player_one_line(ENTRY_SKILL_DIG, desc, likert_color);
+
if (!muta_att)
display_player_one_line(ENTRY_BLOWS, format("%d+%d", blows1, blows2), TERM_L_BLUE);
else
* @todo
* xtra1.c周りと多重実装になっているのを何とかする
*/
-static void player_flags(u32b flgs[TR_FLAG_SIZE])
+static void player_flags(BIT_FLAGS flgs[TR_FLAG_SIZE])
{
int i;
* @todo
* xtra1.c周りと多重実装になっているのを何とかする
*/
-static void tim_player_flags(u32b flgs[TR_FLAG_SIZE])
+static void tim_player_flags(BIT_FLAGS flgs[TR_FLAG_SIZE])
{
int i;
* @param mode オプション
* @return なし
*/
-static void display_player_equippy(int y, int x, u16b mode)
+static void display_player_equippy(TERM_LEN y, TERM_LEN x, BIT_FLAGS16 mode)
{
int i, max_i;
- byte a;
+ TERM_COLOR a;
char c;
object_type *o_ptr;
* @todo
* xtra1.c周りと多重実装になっているのを何とかする
*/
-static void known_obj_immunity(u32b flgs[TR_FLAG_SIZE])
+static void known_obj_immunity(BIT_FLAGS flgs[TR_FLAG_SIZE])
{
int i;
* @todo
* xtra1.c周りと多重実装になっているのを何とかする
*/
-static void player_immunity(u32b flgs[TR_FLAG_SIZE])
+static void player_immunity(BIT_FLAGS flgs[TR_FLAG_SIZE])
{
int i;
* @todo
* xtra1.c周りと多重実装になっているのを何とかする
*/
-static void tim_player_immunity(u32b flgs[TR_FLAG_SIZE])
+static void tim_player_immunity(BIT_FLAGS flgs[TR_FLAG_SIZE])
{
int i;
* @todo
* xtra1.c周りと多重実装になっているのを何とかする
*/
-static void player_vuln_flags(u32b flgs[TR_FLAG_SIZE])
+static void player_vuln_flags(BIT_FLAGS flgs[TR_FLAG_SIZE])
{
int i;
* A struct for storing misc. flags
*/
typedef struct {
- u32b player_flags[TR_FLAG_SIZE];
- u32b tim_player_flags[TR_FLAG_SIZE];
- u32b player_imm[TR_FLAG_SIZE];
- u32b tim_player_imm[TR_FLAG_SIZE];
- u32b player_vuln[TR_FLAG_SIZE];
- u32b known_obj_imm[TR_FLAG_SIZE];
+ BIT_FLAGS player_flags[TR_FLAG_SIZE];
+ BIT_FLAGS tim_player_flags[TR_FLAG_SIZE];
+ BIT_FLAGS player_imm[TR_FLAG_SIZE];
+ BIT_FLAGS tim_player_imm[TR_FLAG_SIZE];
+ BIT_FLAGS player_vuln[TR_FLAG_SIZE];
+ BIT_FLAGS known_obj_imm[TR_FLAG_SIZE];
} all_player_flags;
* @param mode 表示オプション
* @return なし
*/
-static void display_flag_aux(int row, int col, cptr header,
+static void display_flag_aux(TERM_LEN row, TERM_LEN col, concptr header,
int flag1, all_player_flags *f, u16b mode)
{
int i;
/* Check equipment */
for (i = INVEN_RARM; i < max_i; i++)
{
- u32b flgs[TR_FLAG_SIZE];
+ BIT_FLAGS flgs[TR_FLAG_SIZE];
object_type *o_ptr;
/* Object */
*/
static void display_player_flag_info(void)
{
- int row;
- int col;
+ TERM_LEN row;
+ TERM_LEN col;
all_player_flags f;
c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+8);
#ifdef JP
-display_flag_aux(row+0, col, "耐酸 :", TR_RES_ACID, &f, 0);
-display_flag_aux(row+0, col, "耐酸 :", TR_IM_ACID, &f, DP_IMM);
-display_flag_aux(row+1, col, "耐電撃:", TR_RES_ELEC, &f, 0);
-display_flag_aux(row+1, col, "耐電撃:", TR_IM_ELEC, &f, DP_IMM);
-display_flag_aux(row+2, col, "耐火炎:", TR_RES_FIRE, &f, 0);
-display_flag_aux(row+2, col, "耐火炎:", TR_IM_FIRE, &f, DP_IMM);
-display_flag_aux(row+3, col, "耐冷気:", TR_RES_COLD, &f, 0);
-display_flag_aux(row+3, col, "耐冷気:", TR_IM_COLD, &f, DP_IMM);
-display_flag_aux(row+4, col, "耐毒 :", TR_RES_POIS, &f, 0);
-display_flag_aux(row+5, col, "耐閃光:", TR_RES_LITE, &f, 0);
-display_flag_aux(row+6, col, "耐暗黒:", TR_RES_DARK, &f, 0);
-display_flag_aux(row+7, col, "耐破片:", TR_RES_SHARDS, &f, 0);
-display_flag_aux(row+8, col, "耐盲目:", TR_RES_BLIND, &f, 0);
-display_flag_aux(row+9, col, "耐混乱:", TR_RES_CONF, &f, 0);
+ display_flag_aux(row+0, col, "耐酸 :", TR_RES_ACID, &f, 0);
+ display_flag_aux(row+0, col, "耐酸 :", TR_IM_ACID, &f, DP_IMM);
+ display_flag_aux(row+1, col, "耐電撃:", TR_RES_ELEC, &f, 0);
+ display_flag_aux(row+1, col, "耐電撃:", TR_IM_ELEC, &f, DP_IMM);
+ display_flag_aux(row+2, col, "耐火炎:", TR_RES_FIRE, &f, 0);
+ display_flag_aux(row+2, col, "耐火炎:", TR_IM_FIRE, &f, DP_IMM);
+ display_flag_aux(row+3, col, "耐冷気:", TR_RES_COLD, &f, 0);
+ display_flag_aux(row+3, col, "耐冷気:", TR_IM_COLD, &f, DP_IMM);
+ display_flag_aux(row+4, col, "耐毒 :", TR_RES_POIS, &f, 0);
+ display_flag_aux(row+5, col, "耐閃光:", TR_RES_LITE, &f, 0);
+ display_flag_aux(row+6, col, "耐暗黒:", TR_RES_DARK, &f, 0);
+ display_flag_aux(row+7, col, "耐破片:", TR_RES_SHARDS, &f, 0);
+ display_flag_aux(row+8, col, "耐盲目:", TR_RES_BLIND, &f, 0);
+ display_flag_aux(row+9, col, "耐混乱:", TR_RES_CONF, &f, 0);
#else
display_flag_aux(row+0, col, "Acid :", TR_RES_ACID, &f, 0);
display_flag_aux(row+0, col, "Acid :", TR_IM_ACID, &f, DP_IMM);
c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+8);
#ifdef JP
-display_flag_aux(row+0, col, "耐轟音:", TR_RES_SOUND, &f, 0);
-display_flag_aux(row+1, col, "耐地獄:", TR_RES_NETHER, &f, 0);
-display_flag_aux(row+2, col, "耐因混:", TR_RES_NEXUS, &f, 0);
-display_flag_aux(row+3, col, "耐カオ:", TR_RES_CHAOS, &f, 0);
-display_flag_aux(row+4, col, "耐劣化:", TR_RES_DISEN, &f, 0);
-display_flag_aux(row+5, col, "耐恐怖:", TR_RES_FEAR, &f, 0);
-display_flag_aux(row+6, col, "反射 :", TR_REFLECT, &f, 0);
-display_flag_aux(row+7, col, "火炎オ:", TR_SH_FIRE, &f, 0);
-display_flag_aux(row+8, col, "電気オ:", TR_SH_ELEC, &f, 0);
-display_flag_aux(row+9, col, "冷気オ:", TR_SH_COLD, &f, 0);
+ display_flag_aux(row+0, col, "耐轟音:", TR_RES_SOUND, &f, 0);
+ display_flag_aux(row+1, col, "耐地獄:", TR_RES_NETHER, &f, 0);
+ display_flag_aux(row+2, col, "耐因混:", TR_RES_NEXUS, &f, 0);
+ display_flag_aux(row+3, col, "耐カオ:", TR_RES_CHAOS, &f, 0);
+ display_flag_aux(row+4, col, "耐劣化:", TR_RES_DISEN, &f, 0);
+ display_flag_aux(row+5, col, "耐恐怖:", TR_RES_FEAR, &f, 0);
+ display_flag_aux(row+6, col, "反射 :", TR_REFLECT, &f, 0);
+ display_flag_aux(row+7, col, "火炎オ:", TR_SH_FIRE, &f, 0);
+ display_flag_aux(row+8, col, "電気オ:", TR_SH_ELEC, &f, 0);
+ display_flag_aux(row+9, col, "冷気オ:", TR_SH_COLD, &f, 0);
#else
display_flag_aux(row+0, col, "Sound :", TR_RES_SOUND, &f, 0);
display_flag_aux(row+1, col, "Nether:", TR_RES_NETHER, &f, 0);
c_put_str(TERM_WHITE, "abcdefghijkl@", row-1, col+12);
#ifdef JP
-display_flag_aux(row+0, col, "加速 :", TR_SPEED, &f, 0);
-display_flag_aux(row+1, col, "耐麻痺 :", TR_FREE_ACT, &f, 0);
-display_flag_aux(row+2, col, "透明体視認:", TR_SEE_INVIS, &f, 0);
-display_flag_aux(row+3, col, "経験値保持:", TR_HOLD_EXP, &f, 0);
-display_flag_aux(row+4, col, "警告 :", TR_WARNING, &f, 0);
-display_flag_aux(row+5, col, "遅消化 :", TR_SLOW_DIGEST, &f, 0);
-display_flag_aux(row+6, col, "急回復 :", TR_REGEN, &f, 0);
-display_flag_aux(row+7, col, "浮遊 :", TR_LEVITATION, &f, 0);
-display_flag_aux(row+8, col, "永遠光源 :", TR_LITE_1, &f, 0);
-display_flag_aux(row+9, col, "呪い :", 0, &f, DP_CURSE);
+ display_flag_aux(row+0, col, "加速 :", TR_SPEED, &f, 0);
+ display_flag_aux(row+1, col, "耐麻痺 :", TR_FREE_ACT, &f, 0);
+ display_flag_aux(row+2, col, "透明体視認:", TR_SEE_INVIS, &f, 0);
+ display_flag_aux(row+3, col, "経験値保持:", TR_HOLD_EXP, &f, 0);
+ display_flag_aux(row+4, col, "警告 :", TR_WARNING, &f, 0);
+ display_flag_aux(row+5, col, "遅消化 :", TR_SLOW_DIGEST, &f, 0);
+ display_flag_aux(row+6, col, "急回復 :", TR_REGEN, &f, 0);
+ display_flag_aux(row+7, col, "浮遊 :", TR_LEVITATION, &f, 0);
+ display_flag_aux(row+8, col, "永遠光源 :", TR_LITE_1, &f, 0);
+ display_flag_aux(row+9, col, "呪い :", 0, &f, DP_CURSE);
#else
display_flag_aux(row+0, col, "Speed :", TR_SPEED, &f, 0);
display_flag_aux(row+1, col, "FreeAction:", TR_FREE_ACT, &f, 0);
*/
static void display_player_other_flag_info(void)
{
- int row;
- int col;
+ TERM_LEN row;
+ TERM_LEN col;
all_player_flags f;
#else
strcat(tmp," ");
#endif
- strcat(tmp,player_name);
+ strcat(tmp,p_ptr->name);
c_put_str(TERM_L_BLUE, tmp, 1, 34);
c_put_str(TERM_L_BLUE, sp_ptr->title, 3, 9);
int row, col;
object_type *o_ptr;
- u32b flgs[TR_FLAG_SIZE];
+ BIT_FLAGS flgs[TR_FLAG_SIZE];
byte a;
char c;
row = 3;
/* Print out the labels for the columns */
-#ifdef JP
-c_put_str(TERM_WHITE, "能力", row, stat_col+1);
-c_put_str(TERM_BLUE, " 基本", row, stat_col+7);
-c_put_str(TERM_L_BLUE, " 種 職 性 装 ", row, stat_col+13);
-c_put_str(TERM_L_GREEN, "合計", row, stat_col+28);
-c_put_str(TERM_YELLOW, "現在", row, stat_col+35);
-#else
- c_put_str(TERM_WHITE, "Stat", row, stat_col+1);
- c_put_str(TERM_BLUE, " Base", row, stat_col+7);
- c_put_str(TERM_L_BLUE, "RacClaPerMod", row, stat_col+13);
- c_put_str(TERM_L_GREEN, "Actual", row, stat_col+26);
- c_put_str(TERM_YELLOW, "Current", row, stat_col+32);
-#endif
-
+ c_put_str(TERM_WHITE, _("能力", "Stat"), row, stat_col+1);
+ c_put_str(TERM_BLUE, _(" 基本", " Base"), row, stat_col+7);
+ c_put_str(TERM_L_BLUE, _(" 種 職 性 装 ", "RacClaPerMod"), row, stat_col+13);
+ c_put_str(TERM_L_GREEN, _("合計", "Actual"), row, stat_col+28);
+ c_put_str(TERM_YELLOW, _("現在", "Current"), row, stat_col+35);
/* Display the stats */
- for (i = 0; i < 6; i++)
+ for (i = 0; i < A_MAX; i++)
{
int r_adj;
/* Process equipment */
for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
{
- /* Access object */
o_ptr = &inventory[i];
/* Acquire "known" flags */
object_flags_known(o_ptr, flgs);
/* Initialize color based of sign of pval. */
- for (stat = 0; stat < 6; stat++)
+ for (stat = 0; stat < A_MAX; stat++)
{
/* Default */
a = TERM_SLATE;
player_flags(flgs);
/* Check stats */
- for (stat = 0; stat < 6; stat++)
+ for (stat = 0; stat < A_MAX; stat++)
{
/* Default */
a = TERM_SLATE;
void display_player(int mode)
{
int i;
+ char buf[80];
+ char tmp[64];
- char buf[80];
- char tmp[64];
-
-
- /* XXX XXX XXX */
if ((p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) && display_mutations)
mode = (mode % 5);
else
{
/* Name, Sex, Race, Class */
#ifdef JP
- sprintf(tmp, "%s%s%s", ap_ptr->title, ap_ptr->no == 1 ? "の":"", player_name);
+ sprintf(tmp, "%s%s%s", ap_ptr->title, ap_ptr->no == 1 ? "の":"", p_ptr->name);
#else
- sprintf(tmp, "%s %s", ap_ptr->title, player_name);
+ sprintf(tmp, "%s %s", ap_ptr->title, p_ptr->name);
#endif
display_player_one_line(ENTRY_NAME, tmp, TERM_L_BLUE);
/* Display the stats */
- for (i = 0; i < 6; i++)
+ for (i = 0; i < A_MAX; i++)
{
/* Special treatment of "injured" stats */
if (p_ptr->stat_cur[i] < p_ptr->stat_max[i])
else
{
#ifdef JP
- sprintf(statmsg, "…あなたは、%sの%d階で%sに殺された。", map_name(), dun_level, p_ptr->died_from);
+ sprintf(statmsg, "…あなたは、%sの%d階で%sに殺された。", map_name(), (int)dun_level, p_ptr->died_from);
#else
sprintf(statmsg, "...You were killed by %s on level %d of %s.", p_ptr->died_from, dun_level, map_name());
#endif
else
{
#ifdef JP
- sprintf(statmsg, "…あなたは現在、 %s の %d 階で探索している。", map_name(), dun_level);
+ sprintf(statmsg, "…あなたは現在、 %s の %d 階で探索している。", map_name(), (int)dun_level);
#else
sprintf(statmsg, "...Now, you are exploring level %d of %s.", dun_level, map_name());
#endif
*/
static void dump_aux_display_player(FILE *fff)
{
- int x, y;
- byte a;
+ TERM_LEN x, y;
+ TERM_COLOR a;
char c;
- char buf[1024];
+ char buf[1024];
- /* Display player */
display_player(0);
/* Dump part of the screen */
int i;
bool pet = FALSE;
bool pet_settings = FALSE;
- char pet_name[80];
+ GAME_TEXT pet_name[MAX_NLEN];
for (i = m_max - 1; i >= 1; i--)
{
int l2 = 0;
int num = 0;
int spellnum[MAX_MONSPELLS];
- s32b f4 = 0, f5 = 0, f6 = 0;
+ BIT_FLAGS f4 = 0, f5 = 0, f6 = 0;
char p[60][80];
int col = 0;
bool pcol = FALSE;
else if (p_ptr->pclass == CLASS_MAGIC_EATER)
{
char s[EATER_EXT][MAX_NLEN];
- int tval, ext, k_idx;
- int i, magic_num;
+ OBJECT_TYPE_VALUE tval = 0;
+ int ext;
+ KIND_OBJECT_IDX k_idx;
+ OBJECT_SUBTYPE_VALUE i;
+ int magic_num;
fprintf(fff, _("\n\n [取り込んだ魔法道具]\n", "\n\n [Magic devices eaten]\n"));
for (i = 0; i < row; i++)
{
fprintf(fff, "\n");
- fprintf(fff, "%-11s %5d ", essence_name[id[i]], p_ptr->magic_num1[id[i]]);
- if(i + row < n) fprintf(fff, "%-11s %5d ", essence_name[id[i + row]], p_ptr->magic_num1[id[i + row]]);
- if(i + row * 2 < n) fprintf(fff, "%-11s %5d", essence_name[id[i + row * 2]], p_ptr->magic_num1[id[i + row * 2]]);
+ fprintf(fff, "%-11s %5d ", essence_name[id[i]], (int)p_ptr->magic_num1[id[i]]);
+ if(i + row < n) fprintf(fff, "%-11s %5d ", essence_name[id[i + row]], (int)p_ptr->magic_num1[id[i + row]]);
+ if(i + row * 2 < n) fprintf(fff, "%-11s %5d", essence_name[id[i + row * 2]], (int)p_ptr->magic_num1[id[i + row * 2]]);
}
fputs("\n", fff);
*/
static void dump_aux_quest(FILE *fff)
{
- int i;
- int *quest_num;
+ IDX i;
+ IDX *quest_num;
int dummy;
fprintf(fff, _("\n\n [クエスト情報]\n", "\n\n [Quest Information]\n"));
/* Allocate Memory */
- C_MAKE(quest_num, max_quests, int);
+ C_MAKE(quest_num, max_q_idx, IDX);
/* Sort by compete level */
- for (i = 1; i < max_quests; i++) quest_num[i] = i;
+ for (i = 1; i < max_q_idx; i++) quest_num[i] = i;
ang_sort_comp = ang_sort_comp_quest_num;
ang_sort_swap = ang_sort_swap_quest_num;
- ang_sort(quest_num, &dummy, max_quests);
+ ang_sort(quest_num, &dummy, max_q_idx);
/* Dump Quest Information */
fputc('\n', fff);
fputc('\n', fff);
/* Free Memory */
- C_KILL(quest_num, max_quests, int);
+ C_KILL(quest_num, max_q_idx, IDX);
}
}
else if (max_dlv[y] == d_info[y].maxdepth) seiha = TRUE;
-#ifdef JP
- fprintf(fff, " %c%-12s: %3d 階\n", seiha ? '!' : ' ', d_name+d_info[y].name, max_dlv[y]);
-#else
- fprintf(fff, " %c%-16s: level %3d\n", seiha ? '!' : ' ', d_name+d_info[y].name, max_dlv[y]);
-#endif
+ fprintf(fff, _(" %c%-12s: %3d 階\n", " %c%-16s: level %3d\n"),
+ seiha ? '!' : ' ', d_name+d_info[y].name, (int)max_dlv[y]);
}
}
{
/* Monsters slain */
- int k;
+ IDX k;
long uniq_total = 0;
long norm_total = 0;
- s16b *who;
+ IDX *who;
/* Sort by monster level */
u16b why = 2;
for (k = uniq_total - 1; k >= 0 && k >= uniq_total - 10; k--)
{
monster_race *r_ptr = &r_info[who[k]];
- fprintf(fff, _(" %-40s (レベル%3d)\n", " %-40s (level %3d)\n"), (r_name + r_ptr->name), r_ptr->level);
+ fprintf(fff, _(" %-40s (レベル%3d)\n", " %-40s (level %3d)\n"), (r_name + r_ptr->name), (int)r_ptr->level);
}
}
else fprintf(fff, "Your current Life Rating is ???.\n\n");
fprintf(fff, "Limits of maximum stats\n");
#endif
- for (v_nr = 0; v_nr < 6; v_nr++)
+ for (v_nr = 0; v_nr < A_MAX; v_nr++)
{
if ((p_ptr->knowledge & KNOW_STAT) || p_ptr->stat_max[v_nr] == p_ptr->stat_max_max[v_nr]) fprintf(fff, "%s 18/%d\n", stat_names[v_nr], p_ptr->stat_max_max[v_nr]-18);
else fprintf(fff, "%s ???\n", stat_names[v_nr]);
static void dump_aux_equipment_inventory(FILE *fff)
{
int i;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
/* Dump the equipment */
if (equip_cnt)
*/
static void dump_aux_home_museum(FILE *fff)
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
store_type *st_ptr;
/* Do we need it?? */
if (st_ptr->stock_num)
{
int i;
- int x = 1;
+ TERM_LEN x = 1;
fprintf(fff, _(" [我が家のアイテム]\n", " [Home Inventory]\n"));
if (st_ptr->stock_num)
{
int i;
- int x = 1;
+ TERM_LEN x = 1;
fprintf(fff, _(" [博物館のアイテム]\n", " [Museum]\n"));
* @param name 出力ファイル名
* @return エラーコード
* @details
- * XXX XXX XXX Allow the "full" flag to dump additional info,
+ * Allow the "full" flag to dump additional info,
* and trigger its usage from various places in the code.
*/
-errr file_character(cptr name)
+errr file_character(concptr name)
{
int fd = -1;
FILE *fff = NULL;
if (fd >= 0)
{
char out_val[160];
-
- /* Close the file */
(void)fd_close(fd);
/* Build query */
/* Invalid file */
if (!fff)
{
- /* Message */
prt(_("キャラクタ情報のファイルへの書き出しに失敗しました！", "Character dump failed!"), 0, 0);
(void)inkey();
my_fclose(fff);
- /* Message */
msg_print(_("キャラクタ情報のファイルへの書き出しに成功しました。", "Character dump successful."));
msg_print(NULL);
* You can use any single character in place of the "|".
* </pre>
*/
-static void show_file_aux_line(cptr str, int cy, cptr shower)
+static void show_file_aux_line(concptr str, int cy, concptr shower)
{
static const char tag_str[] = "[[[[";
byte color = TERM_WHITE;
int showercol = len + 1;
int bracketcol = len + 1;
int endcol = len;
- cptr ptr;
+ concptr ptr;
/* Search for a shower string in the line */
if (shower)
* Return FALSE on 'q' to exit from a deep, otherwise TRUE.
* </pre>
*/
-bool show_file(bool show_version, cptr name, cptr what, int line, int mode)
+bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode)
{
int i, n, skey;
FILE *fff = NULL;
/* Find this string (if any) */
- cptr find = NULL;
+ concptr find = NULL;
/* Jump to this tag */
- cptr tag = NULL;
+ concptr tag = NULL;
/* Hold strings to find/show */
char finder_str[81];
char back_str[81];
/* String to show */
- cptr shower = NULL;
+ concptr shower = NULL;
/* Filename */
char filename[1024];
/* Redirect the name */
name = filename;
- /* Hack XXX XXX XXX */
+ /* Hack */
if (what)
{
/* Caption */
fff = my_fopen(path, "r");
}
- /* Oops */
if (!fff)
{
- /* Message */
msg_format(_("'%s'をオープンできません。", "Cannot open '%s'."), name);
msg_print(NULL);
- /* Oops */
return (TRUE);
}
/* start from bottom when reverse mode */
if (line == -1) line = ((size-1)/rows)*rows;
-
- /* Clear screen */
Term_clear();
/* Display the file */
/* Hack -- Re-Open the file */
fff = my_fopen(path, "r");
- /* Oops */
if (!fff) return (FALSE);
/* File has been restarted */
/* Dump the next 20, or rows, lines of the file */
for (i = 0; i < rows; )
{
- cptr str = buf;
+ concptr str = buf;
/* Hack -- track the "first" line */
if (!i) line = next;
ffp = my_fopen(buff, "w");
- /* Oops */
if (!(fff && ffp))
{
msg_print(_("ファイルを開けません。", "Failed to open file."));
break;
}
- sprintf(xtmp, "%s: %s", player_name, what ? what : caption);
+ sprintf(xtmp, "%s: %s", p_ptr->name, what ? what : caption);
my_fputs(ffp, xtmp, 80);
my_fputs(ffp, "\n", 80);
/* Exit on the q key */
if (skey == 'q') break;
}
-
- /* Close the file */
my_fclose(fff);
/* Escape */
*/
void do_cmd_help(void)
{
- /* Save screen */
screen_save();
/* Peruse the main help file */
(void)show_file(TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0);
-
- /* Load screen */
screen_load();
}
if (character_generated) strcpy(old_player_base, player_base);
/* Cannot be too long */
-#if defined(MACINTOSH) || defined(MSDOS) || defined(USE_EMX) || defined(ACORN) || defined(VM)
-#ifdef MSDOS
- if (strlen(player_name) > 8)
-#else
- if (strlen(player_name) > 15)
-#endif
+#if defined(MACINTOSH) || defined(ACORN)
+ if (strlen(p_ptr->name) > 15)
{
/* Name too long */
- quit_fmt(_("'%s'という名前は長すぎます！", "The name '%s' is too long!"), player_name);
+ quit_fmt(_("'%s'という名前は長すぎます！", "The name '%s' is too long!"), p_ptr->name);
}
#endif
/* Cannot contain "icky" characters */
- for (i = 0; player_name[i]; i++)
+ for (i = 0; p_ptr->name[i]; i++)
{
/* No control characters */
#ifdef JP
- if (iskanji(player_name[i])){i++;continue;}
- if (iscntrl( (unsigned char)player_name[i]))
+ if (iskanji(p_ptr->name[i])){i++;continue;}
+ if (iscntrl( (unsigned char)p_ptr->name[i]))
#else
- if (iscntrl(player_name[i]))
+ if (iscntrl(p_ptr->name[i]))
#endif
{
/* Illegal characters */
- quit_fmt(_("'%s' という名前は不正なコントロールコードを含んでいます。", "The name '%s' contains control chars!"), player_name);
+ quit_fmt(_("'%s' という名前は不正なコントロールコードを含んでいます。", "The name '%s' contains control chars!"), p_ptr->name);
}
}
#ifdef MACINTOSH
/* Extract "useful" letters */
- for (i = 0; player_name[i]; i++)
+ for (i = 0; p_ptr->name[i]; i++)
{
#ifdef JP
- unsigned char c = player_name[i];
+ unsigned char c = p_ptr->name[i];
#else
- char c = player_name[i];
+ char c = p_ptr->name[i];
#endif
#else
/* Extract "useful" letters */
- for (i = 0; player_name[i]; i++)
+ for (i = 0; p_ptr->name[i]; i++)
{
#ifdef JP
- unsigned char c = player_name[i];
+ unsigned char c = p_ptr->name[i];
#else
- char c = player_name[i];
+ char c = p_ptr->name[i];
#endif
/* Accept some letters */
#ifdef JP
if(iskanji(c)){
- if(k + 2 >= sizeof(player_base) || !player_name[i+1]) break;
+ if(k + 2 >= sizeof(player_base) || !p_ptr->name[i+1]) break;
player_base[k++] = c;
i++;
- player_base[k++] = player_name[i];
+ player_base[k++] = p_ptr->name[i];
}
#ifdef SJIS
else if (iskana(c)) player_base[k++] = c;
else
#endif
/* Convert path separator to underscore */
- if (!strncmp(PATH_SEP, player_name+i, strlen(PATH_SEP))){
+ if (!strncmp(PATH_SEP, p_ptr->name+i, strlen(PATH_SEP))){
player_base[k++] = '_';
i += strlen(PATH_SEP);
}
/* Convert some characters to underscore */
-#ifdef MSDOS
- else if (my_strchr(" \"*+,./:;<=>?[\\]|", c)) player_base[k++] = '_';
-#elif defined(WINDOWS)
+#if defined(WINDOWS)
else if (my_strchr("\"*,/:;<>?\\|", c)) player_base[k++] = '_';
#endif
else if (isprint(c)) player_base[k++] = c;
#endif
-
-#if defined(MSDOS)
-
- /* Hack -- max length */
- if (k > 8) k = 8;
-
-#endif
-
/* Terminate */
player_base[k] = '\0';
#endif
if (!savefile_base[0] && savefile[0])
{
- cptr s;
+ concptr s;
s = savefile;
while (1)
{
- cptr t;
+ concptr t;
t = my_strstr(s, PATH_SEP);
if (!t)
break;
(void)sprintf(temp, "%s", player_base);
#endif
-#ifdef VM
- /* Hack -- support "flat directory" usage on VM/ESA */
- (void)sprintf(temp, "%s.sv", player_base);
-#endif /* VM */
-
/* Build the filename */
path_build(savefile, sizeof(savefile), ANGBAND_DIR_SAVE, temp);
}
* Assumes that "display_player(0)" has just been called
* Perhaps we should NOT ask for a name (at "birth()") on
* Unix machines? XXX XXX
- * What a horrible name for a global function. XXX XXX XXX
+ * What a horrible name for a global function.
* </pre>
*/
void get_name(void)
char tmp[64];
/* Save the player name */
- strcpy(tmp, player_name);
+ strcpy(tmp, p_ptr->name);
/* Prompt for a new name */
if (get_string(_("キャラクターの名前を入力して下さい: ", "Enter a name for your character: "), tmp, 15))
{
/* Use the name */
- strcpy(player_name, tmp);
+ strcpy(p_ptr->name, tmp);
}
- if (0 == strlen(player_name))
+ if (0 == strlen(p_ptr->name))
{
/* Use default name */
- strcpy(player_name, "PLAYER");
+ strcpy(p_ptr->name, "PLAYER");
}
strcpy(tmp,ap_ptr->title);
#else
strcat(tmp, " ");
#endif
- strcat(tmp,player_name);
+ strcat(tmp,p_ptr->name);
/* Re-Draw the name (in light blue) */
Term_erase(34, 1, 255);
}
else
{
- /* Disturb the player */
- disturb(1, 1);
+ disturb(TRUE, TRUE);
}
/* Clear messages */
msg_print(NULL);
-
- /* Handle stuff */
handle_stuff();
- /* Message */
prt(_("ゲームをセーブしています...", "Saving game..."), 0, 0);
- /* Refresh */
Term_fresh();
/* The player is not dead */
/* Allow suspend again */
signals_handle_tstp();
- /* Refresh */
Term_fresh();
/* Note that the player is not dead */
(void)strcpy(p_ptr->died_from, _("(元気に生きている)", "(alive and well)"));
/* HACK -- don't get sanity blast on updating view */
- hack_mind = FALSE;
+ is_loading_now = FALSE;
- /* Update stuff */
- update_stuff();
+ update_creature(p_ptr);
/* Initialize monster process */
mproc_init();
/* HACK -- reset the hackish flag */
- hack_mind = TRUE;
+ is_loading_now = TRUE;
}
long total_points(void)
{
int i, mult = 100;
- s16b max_dl = 0;
+ DEPTH max_dl = 0;
u32b point, point_h, point_l;
int arena_win = MIN(p_ptr->arena_number, MAX_ARENA_MONS);
* @return なし
* @details
*/
-static void center_string(char *buf, cptr str)
+static void center_string(char *buf, concptr str)
{
int i, j;
{
char tmp[128];
- /* XXX XXX XXX "Bones" name */
+ /* "Bones" name */
sprintf(tmp, "bone.%03d", dun_level);
/* Build the filename */
if (!fp) return;
/* Save the info */
- fprintf(fp, "%s\n", player_name);
+ fprintf(fp, "%s\n", p_ptr->name);
fprintf(fp, "%d\n", p_ptr->mhp);
fprintf(fp, "%d\n", p_ptr->prace);
fprintf(fp, "%d\n", p_ptr->pclass);
/* Print the text-tombstone */
if (!done)
{
- cptr p;
+ concptr p;
char tmp[160];
char buf[1024];
char dummy[80];
#ifdef JP
int extra_line = 0;
#endif
-
- /* Clear screen */
Term_clear();
/* Build the filename */
p = player_title[p_ptr->pclass][(p_ptr->lev - 1) / 5];
}
- center_string(buf, player_name);
+ center_string(buf, p_ptr->name);
put_str(buf, 6, 11);
#ifndef JP
{
if (dun_level == 0)
{
- cptr town = p_ptr->town_num ? "街" : "荒野";
+ concptr field_name = p_ptr->town_num ? "街" : "荒野";
if (streq(p_ptr->died_from, "途中終了"))
{
- sprintf(tmp, "%sで死んだ", town);
+ sprintf(tmp, "%sで死んだ", field_name);
}
else
{
- sprintf(tmp, "に%sで殺された", town);
+ sprintf(tmp, "に%sで殺された", field_name);
}
}
else
{
if (streq(p_ptr->died_from, "途中終了"))
{
- sprintf(tmp, "地下 %d 階で死んだ", dun_level);
+ sprintf(tmp, "地下 %d 階で死んだ", (int)dun_level);
}
else
{
- sprintf(tmp, "に地下 %d 階で殺された", dun_level);
+ sprintf(tmp, "に地下 %d 階で殺された", (int)dun_level);
}
}
center_string(buf, tmp);
(void)sprintf(tmp, "%-.24s", ctime(&ct));
center_string(buf, tmp);
put_str(buf, 17, 11);
- msg_format(_("さようなら、%s!", "Goodbye, %s!"), player_name);
+ msg_format(_("さようなら、%s!", "Goodbye, %s!"), p_ptr->name);
}
}
/* Hack -- Recalculate bonuses */
p_ptr->update |= (PU_BONUS);
-
- /* Handle stuff */
handle_stuff();
/* Flush all input keys */
flush();
- /* Flush messages */
- msg_print(NULL);
+ msg_erase();
/* Describe options */
/* Return means "show on screen" */
if (!out_val[0]) break;
-
- /* Save screen */
screen_save();
/* Dump a character file */
(void)file_character(out_val);
-
- /* Load screen */
screen_load();
}
update_playtime();
-
- /* Display player */
display_player(0);
/* Prompt for inventory */
if (equip_cnt)
{
Term_clear();
- item_tester_full = TRUE;
- (void)show_equip(0);
+ (void)show_equip(0, USE_FULL);
prt(_("装備していたアイテム: -続く-", "You are using: -more-"), 0, 0);
if (inkey() == ESCAPE) return;
if (inven_cnt)
{
Term_clear();
- item_tester_full = TRUE;
- (void)show_inven(0);
+ (void)show_inven(0, USE_FULL);
prt(_("持っていたアイテム: -続く-", "You are carrying: -more-"), 0, 0);
if (inkey() == ESCAPE) return;
/* Display contents of the home */
for (k = 0, i = 0; i < st_ptr->stock_num; k++)
{
- /* Clear screen */
Term_clear();
/* Show 12 items */
for (j = 0; (j < 12) && (i < st_ptr->stock_num); j++, i++)
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
char tmp_val[80];
/* Acquire item */
*/
static bool check_score(void)
{
- /* Clear screen */
Term_clear();
/* No score file */
char buf[1024];
bool do_send = TRUE;
-/* cptr p = "[i:キャラクタの情報, f:ファイル書き出し, t:スコア, x:*鑑定*, ESC:ゲーム終了]"; */
-
- /* Handle stuff */
+/* concptr p = "[i:キャラクタの情報, f:ファイル書き出し, t:スコア, x:*鑑定*, ESC:ゲーム終了]"; */
handle_stuff();
/* Flush the messages */
/* Show more info */
show_info();
-
- /* Clear screen */
Term_clear();
if (check_score())
/* Save the game */
do_cmd_save_game(FALSE);
- /* Prompt for scores XXX XXX XXX */
+ /* Prompt for scores */
prt(_("リターンキーか ESC キーを押して下さい。", "Press Return (or Escape)."), 0, 40);
play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_EXIT);
prt("", 0, 0);
/* Hack -- turn off some things */
- disturb(1, 1);
+ disturb(TRUE, TRUE);
/* Mega-Hack -- Delay death */
if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;
* Based on the monster speech patch by Matt Graham,
* </pre>
*/
-errr get_rnd_line(cptr file_name, int entry, char *output)
+errr get_rnd_line(concptr file_name, int entry, char *output)
{
FILE *fp;
char buf[1024];
/* Copy the line */
if (one_in_(counter + 1)) strcpy(output, buf);
}
-
- /* Close the file */
my_fclose(fp);
/* Success */
* @return エラーコード
* @details
*/
-errr get_rnd_line_jonly(cptr file_name, int entry, char *output, int count)
+errr get_rnd_line_jonly(concptr file_name, int entry, char *output, int count)
{
int i, j, kanji;
errr result = 1;
* @param name ファイル名
* @details
*/
-errr process_autopick_file(cptr name)
+errr process_autopick_file(concptr name)
{
char buf[1024];
path_build(buf, sizeof(buf), ANGBAND_DIR_USER, name);
err = process_pref_file_aux(buf, PREF_TYPE_AUTOPICK);
-
- /* Result */
return (err);
}
* @return エラーコード
* @details
*/
-errr process_histpref_file(cptr name)
+errr process_histpref_file(concptr name)
{
char buf[1024];
errr err = 0;
err = process_pref_file_aux(buf, PREF_TYPE_HISTPREF);
character_xtra = old_character_xtra;
-
- /* Result */
return (err);
}
/* Display the cause */
Term_putstr(0, 0, -1, TERM_WHITE, _("熟慮の上の自殺！", "Contemplating suicide!"));
- /* Flush */
Term_fresh();
}
_("恐ろしいソフトのバグが飛びかかってきた！", "A gruesome software bug LEAPS out at you!"));
- /* Message */
Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save..."));
do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ゲーム異常終了----", "---- Panic Save and Abort Game ----"));
OSDN Git Service
