OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] #37353 コメント整理 / Refactor comments.
[hengband/hengband.git]
/
src
/
wizard2.c
diff --git
a/src/wizard2.c
b/src/wizard2.c
index
1db3c79
..
94514ec
100644
(file)
--- a/
src/wizard2.c
+++ b/
src/wizard2.c
@@
-73,13
+73,9
@@
void do_cmd_rerate(bool display)
p_ptr->update |= (PU_HP);
p_ptr->redraw |= (PR_HP);
p_ptr->update |= (PU_HP);
p_ptr->redraw |= (PR_HP);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
p_ptr->window |= (PW_PLAYER);
-
- /* Handle stuff */
handle_stuff();
handle_stuff();
- /* Message */
if (display)
{
msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent);
if (display)
{
msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent);
@@
-169,14
+165,10
@@
static void wiz_create_named_art(void)
*/
static void do_cmd_wiz_hack_ben(void)
{
*/
static void do_cmd_wiz_hack_ben(void)
{
- /* Oops */
msg_print("Oops.");
(void)probing();
}
msg_print("Oops.");
(void)probing();
}
-
-#ifdef MONSTER_HORDES
-
/*!
* @brief ウィザードモード用モンスターの群れ生成 / Summon a horde of monsters
* @return なし
/*!
* @brief ウィザードモード用モンスターの群れ生成 / Summon a horde of monsters
* @return なし
@@
-195,13
+187,11
@@
static void do_cmd_summon_horde(void)
(void)alloc_horde(wy, wx);
}
(void)alloc_horde(wy, wx);
}
-#endif /* MONSTER_HORDES */
-
/*!
* @brief 32ビット変数のビット配列を並べて描画する / Output a long int in binary format.
* @return なし
*/
/*!
* @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;
@@
-234,7
+224,7
@@
static void prt_binary(u32b flags, int row, int col)
* @param col 表示行
* @return なし
*/
* @param col 表示行
* @return なし
*/
-static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_
POSITION row, TERM_POSITIO
N col)
+static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_
LEN row, TERM_LE
N col)
{
int i, j;
int home = 0;
{
int i, j;
int home = 0;
@@
-566,7
+556,7
@@
static void do_cmd_wiz_change(void)
static void wiz_display_item(object_type *o_ptr)
{
int i, j = 13;
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 */
char buf[256];
/* Extract the flags */
@@
-750,7
+740,7
@@
static KIND_OBJECT_IDX wiz_create_itemtype(void)
{
KIND_OBJECT_IDX i;
int num, max_num;
{
KIND_OBJECT_IDX i;
int num, max_num;
- TERM_
POSITIO
N col, row;
+ TERM_
LE
N col, row;
OBJECT_TYPE_VALUE tval;
cptr tval_desc;
OBJECT_TYPE_VALUE tval;
cptr tval_desc;
@@
-901,8
+891,6
@@
static void wiz_reroll_item(object_type *o_ptr)
/* Hack -- leave artifacts alone */
if (object_is_artifact(o_ptr)) return;
/* Hack -- leave artifacts alone */
if (object_is_artifact(o_ptr)) return;
-
- /* Get local object */
q_ptr = &forge;
/* Copy the object */
q_ptr = &forge;
/* Copy the object */
@@
-1010,7
+998,6
@@
static void wiz_reroll_item(object_type *o_ptr)
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
/* 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);
}
}
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
}
}
@@
-1048,7
+1035,7
@@
static void wiz_statistics(object_type *o_ptr)
char tmp_val[80];
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;
if (object_is_fixed_artifact(o_ptr)) a_info[o_ptr->name1].cur_num = 0;
@@
-1107,30
+1094,22
@@
static void wiz_statistics(object_type *o_ptr)
/* Allow interupt */
if (inkey())
{
/* Allow interupt */
if (inkey())
{
- /* Flush */
flush();
flush();
-
- /* Stop rolling */
- break;
+ break; // stop rolling
}
/* Dump the stats */
prt(format(q, i, correct, matches, better, worse, other), 0, 0);
Term_fresh();
}
}
/* Dump the stats */
prt(format(q, i, correct, matches, better, worse, other), 0, 0);
Term_fresh();
}
-
-
- /* Get local object */
q_ptr = &forge;
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Create an object */
make_object(q_ptr, mode);
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;
if (object_is_fixed_artifact(q_ptr)) a_info[q_ptr->name1].cur_num = 0;
@@
-1288,7
+1267,6
@@
static void do_cmd_wiz_play(void)
cptr q, s;
item_tester_no_ryoute = TRUE;
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;
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;
@@
-1312,8
+1290,6
@@
static void do_cmd_wiz_play(void)
/* Save the screen */
screen_save();
/* Save the screen */
screen_save();
-
- /* Get local object */
q_ptr = &forge;
/* Copy object */
q_ptr = &forge;
/* Copy object */
@@
-1368,7
+1344,6
@@
static void do_cmd_wiz_play(void)
/* Accept change */
if (changed)
{
/* Accept change */
if (changed)
{
- /* Message */
msg_print("Changes accepted.");
/* Recalcurate object's weight */
msg_print("Changes accepted.");
/* Recalcurate object's weight */
@@
-1388,7
+1363,6
@@
static void do_cmd_wiz_play(void)
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
/* 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);
}
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
}
@@
-1453,8
+1427,6
@@
static void wiz_create_item(void)
return;
}
}
return;
}
}
-
- /* Get local object */
q_ptr = &forge;
/* Create the item */
q_ptr = &forge;
/* Create the item */
@@
-1587,7
+1559,6
@@
static void do_cmd_wiz_learn(void)
/* Induce awareness */
if (k_ptr->level <= command_arg)
{
/* Induce awareness */
if (k_ptr->level <= command_arg)
{
- /* Get local object */
q_ptr = &forge;
/* Prepare object */
q_ptr = &forge;
/* Prepare object */
@@
-1623,7
+1594,7
@@
static void do_cmd_wiz_summon(int num)
* @param r_idx モンスター種族ID
* @return なし
* @details
* @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(MONRACE_IDX r_idx)
{
*/
static void do_cmd_wiz_named(MONRACE_IDX r_idx)
{
@@
-1637,7
+1608,7
@@
static void do_cmd_wiz_named(MONRACE_IDX r_idx)
* @param r_idx モンスター種族ID
* @return なし
* @details
* @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(MONRACE_IDX r_idx)
{
*/
static void do_cmd_wiz_named_friendly(MONRACE_IDX r_idx)
{
@@
-1770,10
+1741,7
@@
static void do_cmd_wiz_create_feature(void)
else if (have_flag(f_ptr->flags, FF_MIRROR))
c_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
else if (have_flag(f_ptr->flags, FF_MIRROR))
c_ptr->info |= (CAVE_GLOW | CAVE_OBJECT);
- /* Notice */
note_spot(y, x);
note_spot(y, x);
-
- /* Redraw */
lite_spot(y, x);
/* Update some things */
lite_spot(y, x);
/* Update some things */
@@
-1808,7
+1776,6
@@
static void do_cmd_dump_options(void)
/* Open the file */
fff = my_fopen(buf, "a");
/* Open the file */
fff = my_fopen(buf, "a");
- /* Oops */
if (!fff)
{
msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
if (!fff)
{
msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf);
@@
-1992,11
+1959,9
@@
void do_cmd_debug(void)
do_cmd_rerate(TRUE);
break;
do_cmd_rerate(TRUE);
break;
-#ifdef MONSTER_HORDES
case 'H':
do_cmd_summon_horde();
break;
case 'H':
do_cmd_summon_horde();
break;
-#endif /* MONSTER_HORDES */
/* Identify */
case 'i':
/* Identify */
case 'i':