*/
#include "angband.h"
+#include "selfinfo.h"
/*!
while (1)
{
/* Pre-calculate level 1 hitdice */
- p_ptr->player_hp[0] = p_ptr->hitdie;
+ p_ptr->player_hp[0] = (HIT_POINT)p_ptr->hitdie;
for (i = 1; i < 4; i++)
{
*/
void do_cmd_rerate(bool display)
{
- int percent;
+ PERCENTAGE percent;
/* Rerate */
do_cmd_rerate_aux();
p_ptr->update |= (PU_HP);
p_ptr->redraw |= (PR_HP);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
/* Handle stuff */
handle_stuff();
- /* Message */
if (display)
{
msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent);
*/
static bool wiz_dimension_door(void)
{
- int x = 0, y = 0;
-
+ POSITION x = 0, y = 0;
if (!tgt_pt(&x, &y)) return FALSE;
-
teleport_player_to(y, x, TELEPORT_NONMAGICAL);
-
return (TRUE);
}
char ppp[80], tmp_val[40];
/* Prompt */
- sprintf(ppp, "Dungeon Turn (0-%ld): ", dungeon_turn_limit);
+ sprintf(ppp, "Dungeon Turn (0-%ld): ", (long)dungeon_turn_limit);
/* Default */
- sprintf(tmp_val, "%ld", dungeon_turn);
+ sprintf(tmp_val, "%ld", (long)dungeon_turn);
/* Query */
if (!get_string(ppp, tmp_val, 10)) return (FALSE);
static void wiz_create_named_art(void)
{
char tmp_val[10] = "";
- int a_idx;
+ ARTIFACT_IDX a_idx;
/* Query */
if (!get_string("Artifact ID:", tmp_val, 3)) return;
/* Extract */
- a_idx = atoi(tmp_val);
+ a_idx = (ARTIFACT_IDX)atoi(tmp_val);
if(a_idx < 0) a_idx = 0;
if(a_idx >= max_a_idx) a_idx = 0;
*/
static void do_cmd_wiz_hack_ben(void)
{
- /* Oops */
msg_print("Oops.");
(void)probing();
}
-
-#ifdef MONSTER_HORDES
-
/*!
* @brief ウィザードモード用モンスターの群れ生成 / Summon a horde of monsters
* @return なし
*/
static void do_cmd_summon_horde(void)
{
- int wy = p_ptr->y, wx = p_ptr->x;
+ POSITION wy = p_ptr->y, wx = p_ptr->x;
int attempts = 1000;
while (--attempts)
(void)alloc_horde(wy, wx);
}
-#endif /* MONSTER_HORDES */
-
/*!
* @brief 32ビット変数のビット配列を並べて描画する / Output a long int in binary format.
* @return なし
*/
-static void prt_binary(u32b flags, int row, int col)
+static void prt_binary(BIT_FLAGS flags, int row, int col)
{
- int i;
- u32b bitmask;
+ int i;
+ u32b bitmask;
/* Scan the flags */
for (i = bitmask = 1; i <= 32; i++, bitmask *= 2)
* @param col 表示行
* @return なし
*/
-static void prt_alloc(byte tval, byte sval, int row, int col)
+static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_LEN row, TERM_LEN col)
{
int i, j;
int home = 0;
int total_frac = 0;
for (j = 0; j < alloc_kind_size; j++)
{
- int prob = 0;
+ PERCENTAGE prob = 0;
if (table[j].level <= i)
{
static void wiz_display_item(object_type *o_ptr)
{
int i, j = 13;
- u32b flgs[TR_FLAG_SIZE];
+ BIT_FLAGS flgs[TR_FLAG_SIZE];
char buf[256];
/* Extract the flags */
* @param k_idx ベースアイテムID
* @return なし
*/
-void strip_name(char *buf, int k_idx)
+void strip_name(char *buf, KIND_OBJECT_IDX k_idx)
{
char *t;
* This function returns the k_idx of an object type, or zero if failed
* List up to 50 choices in three columns
*/
-static int wiz_create_itemtype(void)
+static KIND_OBJECT_IDX wiz_create_itemtype(void)
{
- int i, num, max_num;
- int col, row;
- int tval;
+ KIND_OBJECT_IDX i;
+ int num, max_num;
+ TERM_LEN col, row;
+ OBJECT_TYPE_VALUE tval;
cptr tval_desc;
char ch;
- int choice[80];
+ KIND_OBJECT_IDX choice[80];
char buf[160];
wiz_display_item(o_ptr);
p = "Enter new 'to_d' setting: ";
- sprintf(tmp_val, "%d", o_ptr->to_d);
+ sprintf(tmp_val, "%d", (int)o_ptr->to_d);
if (!get_string(p, tmp_val, 5)) return;
o_ptr->to_d = (s16b)atoi(tmp_val);
wiz_display_item(o_ptr);
/* Hack -- leave artifacts alone */
if (object_is_artifact(o_ptr)) return;
-
- /* Get local object */
q_ptr = &forge;
/* Copy the object */
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* Window stuff */
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
}
}
char ch;
cptr quality;
- u32b mode;
+ BIT_FLAGS mode;
object_type forge;
object_type *q_ptr;
char tmp_val[80];
- /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+ /* Mega-Hack -- allow multiple artifacts */
if (object_is_fixed_artifact(o_ptr)) a_info[o_ptr->name1].cur_num = 0;
/* Allow interupt */
if (inkey())
{
- /* Flush */
flush();
-
- /* Stop rolling */
- break;
+ break; // stop rolling
}
/* Dump the stats */
prt(format(q, i, correct, matches, better, worse, other), 0, 0);
Term_fresh();
}
-
-
- /* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Create an object */
make_object(q_ptr, mode);
- /* XXX XXX XXX Mega-Hack -- allow multiple artifacts */
+ /* Mega-Hack -- allow multiple artifacts */
if (object_is_fixed_artifact(q_ptr)) a_info[q_ptr->name1].cur_num = 0;
tmp_qnt = o_ptr->number;
/* Default */
- sprintf(tmp_val, "%d", o_ptr->number);
+ sprintf(tmp_val, "%d", (int)o_ptr->number);
/* Query */
if (get_string("Quantity: ", tmp_val, 2))
*/
static void do_cmd_wiz_play(void)
{
- int item;
+ OBJECT_IDX item;
object_type forge;
object_type *q_ptr;
cptr q, s;
item_tester_no_ryoute = TRUE;
- /* Get an item */
q = "Play with which object? ";
s = "You have nothing to play with.";
if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return;
/* Save the screen */
screen_save();
-
- /* Get local object */
q_ptr = &forge;
/* Copy object */
/* Accept change */
if (changed)
{
- /* Message */
msg_print("Changes accepted.");
/* Recalcurate object's weight */
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
- /* Window stuff */
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
}
object_type forge;
object_type *q_ptr;
- int k_idx;
-
+ OBJECT_IDX k_idx;
/* Save the screen */
screen_save();
/* Restore the screen */
screen_load();
-
/* Return if failed */
if (!k_idx) return;
if (k_info[k_idx].gen_flags & TRG_INSTA_ART)
{
- int i;
+ ARTIFACT_IDX i;
/* Artifactify */
for (i = 1; i < max_a_idx; i++)
return;
}
}
-
- /* Get local object */
q_ptr = &forge;
/* Create the item */
*/
static void do_cmd_wiz_cure_all(void)
{
- /* Restore stats */
- (void)res_stat(A_STR);
- (void)res_stat(A_INT);
- (void)res_stat(A_WIS);
- (void)res_stat(A_CON);
- (void)res_stat(A_DEX);
- (void)res_stat(A_CHR);
-
- /* Restore the level */
- (void)restore_level();
-
- /* Heal the player */
- if (p_ptr->chp < p_ptr->mhp)
- {
- p_ptr->chp = p_ptr->mhp;
- p_ptr->chp_frac = 0;
-
- /* Redraw */
- p_ptr->redraw |= (PR_HP);
-
- /* Window stuff */
- p_ptr->window |= (PW_PLAYER);
- }
-
- /* Restore mana */
- if (p_ptr->csp < p_ptr->msp)
- {
- p_ptr->csp = p_ptr->msp;
- p_ptr->csp_frac = 0;
-
- p_ptr->redraw |= (PR_MANA);
- p_ptr->window |= (PW_PLAYER);
- p_ptr->window |= (PW_SPELL);
- }
-
- /* Cure stuff */
- (void)set_blind(0);
- (void)set_confused(0);
- (void)set_poisoned(0);
- (void)set_afraid(0);
- (void)set_paralyzed(0);
- (void)set_image(0);
- (void)set_stun(0);
- (void)set_cut(0);
- (void)set_slow(0, TRUE);
-
- /* No longer hungry */
+ (void)life_stream(FALSE, FALSE);
+ (void)restore_mana(TRUE);
(void)set_food(PY_FOOD_MAX - 1);
}
if (command_arg <= 0)
{
char ppp[80];
-
char tmp_val[160];
- int tmp_dungeon_type;
+ DUNGEON_IDX tmp_dungeon_type;
/* Prompt */
sprintf(ppp, "Jump which dungeon : ");
/* Ask for a level */
if (!get_string(ppp, tmp_val, 2)) return;
- tmp_dungeon_type = atoi(tmp_val);
+ tmp_dungeon_type = (DUNGEON_IDX)atoi(tmp_val);
if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND;
/* Prompt */
- sprintf(ppp, "Jump to level (0, %d-%d): ", d_info[tmp_dungeon_type].mindepth, d_info[tmp_dungeon_type].maxdepth);
+ sprintf(ppp, "Jump to level (0, %d-%d): ",
+ (int)d_info[tmp_dungeon_type].mindepth, (int)d_info[tmp_dungeon_type].maxdepth);
/* Default */
- sprintf(tmp_val, "%d", dun_level);
+ sprintf(tmp_val, "%d", (int)dun_level);
/* Ask for a level */
if (!get_string(ppp, tmp_val, 10)) return;
/* Extract request */
- command_arg = (s16b)atoi(tmp_val);
+ command_arg = (COMMAND_ARG)atoi(tmp_val);
- dungeon_type = (byte_hack)tmp_dungeon_type;
+ dungeon_type = tmp_dungeon_type;
}
/* Paranoia */
if (command_arg < d_info[dungeon_type].mindepth) command_arg = 0;
/* Paranoia */
- if (command_arg > d_info[dungeon_type].maxdepth) command_arg = d_info[dungeon_type].maxdepth;
+ if (command_arg > d_info[dungeon_type].maxdepth) command_arg = (COMMAND_ARG)d_info[dungeon_type].maxdepth;
/* Accept request */
msg_format("You jump to dungeon level %d.", command_arg);
*/
static void do_cmd_wiz_learn(void)
{
- int i;
+ IDX i;
object_type forge;
object_type *q_ptr;
/* Induce awareness */
if (k_ptr->level <= command_arg)
{
- /* Get local object */
q_ptr = &forge;
/* Prepare object */
static void do_cmd_wiz_summon(int num)
{
int i;
-
for (i = 0; i < num; i++)
{
(void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
* @param r_idx モンスター種族ID
* @return なし
* @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
*/
-static void do_cmd_wiz_named(int r_idx)
+static void do_cmd_wiz_named(MONRACE_IDX r_idx)
{
(void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
}
* @param r_idx モンスター種族ID
* @return なし
* @details
- * XXX XXX XXX This function is rather dangerous
+ * This function is rather dangerous
*/
-static void do_cmd_wiz_named_friendly(int r_idx)
+static void do_cmd_wiz_named_friendly(MONRACE_IDX r_idx)
{
(void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
}
*/
static void do_cmd_wiz_zap(void)
{
- int i;
+ MONSTER_IDX i;
/* Genocide everyone nearby */
*/
static void do_cmd_wiz_zap_all(void)
{
- int i;
+ MONSTER_IDX i;
/* Genocide everyone */
for (i = 1; i < m_max; i++)
cave_type *c_ptr;
feature_type *f_ptr;
char tmp_val[160];
- int tmp_feat, tmp_mimic;
- int y, x;
+ IDX tmp_feat, tmp_mimic;
+ POSITION y, x;
if (!tgt_pt(&x, &y)) return;
if (!get_string(_("地形: ", "Feature: "), tmp_val, 3)) return;
/* Extract */
- tmp_feat = atoi(tmp_val);
+ tmp_feat = (IDX)atoi(tmp_val);
if (tmp_feat < 0) tmp_feat = 0;
else if (tmp_feat >= max_f_idx) tmp_feat = max_f_idx - 1;
if (!get_string(_("地形 (mimic): ", "Feature (mimic): "), tmp_val, 3)) return;
/* Extract */
- tmp_mimic = atoi(tmp_val);
+ tmp_mimic = (IDX)atoi(tmp_val);
if (tmp_mimic < 0) tmp_mimic = 0;
else if (tmp_mimic >= max_f_idx) tmp_mimic = max_f_idx - 1;
else if (have_flag(f_ptr->flags, FF_MIRROR))
c_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
- /* Notice */
note_spot(y, x);
-
- /* Redraw */
lite_spot(y, x);
/* Update some things */
/* Open the file */
fff = my_fopen(buf, "a");
- /* Oops */
if (!fff)
{
msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
do_cmd_rerate(TRUE);
break;
-#ifdef MONSTER_HORDES
case 'H':
do_cmd_summon_horde();
break;
-#endif /* MONSTER_HORDES */
/* Identify */
case 'i':
OSDN Git Service
