X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fwizard2.c;h=1c94028aa52c9d1872bc7c4abfd32a970cacb730;hb=924ccf7dec90442b9f1dc29743203792b11fdd3d;hp=dc0993d6dd00f6891e49fee8d022529cb1720042;hpb=f5ef2743755d65cb49e2ad144a2c094ce62652b6;p=hengband%2Fhengband.git
diff --git a/src/wizard2.c b/src/wizard2.c
index dc0993d6d..1c94028aa 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1,20 +1,21 @@
-/* File: wizard2.c */
-
-/*
- * Copyright (c) 1997 Ben Harrison, and others
- *
+/*!
+ * @file wizard2.c
+ * @brief ã¦ã£ã¶ã¼ãã¢ã¼ãã®å¦ç(ç¹å¥å¦çä¸å¿) / Wizard commands
+ * @date 2014/09/07
+ * @author
+ * Copyright (c) 1997 Ben Harrison, and others
* This software may be copied and distributed for educational, research,
* and not for profit purposes provided that this copyright and statement
- * are included in all such copies. Other copyrights may also apply.
+ * are included in all such copies. Other copyrights may also apply.
+ * 2014 Deskull rearranged comment for Doxygen.
*/
-/* Purpose: Wizard commands */
-
#include "angband.h"
-/*
- * Roll the hitdie -- aux of do_cmd_rerate()
+/*!
+ * @brief ãã¬ã¤ã¤ã¼ã®ããããã¤ã¹ãæ¯ãç´ã / Roll the hitdie -- aux of do_cmd_rerate()
+ * @return ãªã
*/
void do_cmd_rerate_aux(void)
{
@@ -30,7 +31,7 @@ void do_cmd_rerate_aux(void)
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++)
{
@@ -50,8 +51,10 @@ void do_cmd_rerate_aux(void)
}
-/*
- * Hack -- Rerate Hitpoints
+/*!
+ * @brief ãã¬ã¤ã¤ã¼ã®ããããã¤ã¹ãæ¯ãç´ããå¾æ示ãè¡ã / Hack -- Rerate Hitpoints
+ * @param display TRUEãªãã°ä½åã©ã³ã¯ãæ示ãã
+ * @return ãªã
*/
void do_cmd_rerate(bool display)
{
@@ -78,20 +81,12 @@ void do_cmd_rerate(bool display)
/* Message */
if (display)
{
-#ifdef JP
- msg_format("¸½ºß¤ÎÂÎÎÏ¥é¥ó¥¯¤Ï %d/100 ¤Ç¤¹¡£", percent);
-#else
- msg_format("Your life rate is %d/100 now.", percent);
-#endif
+ msg_format(_("ç¾å¨ã®ä½åã©ã³ã¯ã¯ %d/100 ã§ãã", "Your life rate is %d/100 now."), percent);
p_ptr->knowledge |= KNOW_HPRATE;
}
else
{
-#ifdef JP
- msg_print("ÂÎÎÏ¥é¥ó¥¯¤¬ÊѤï¤Ã¤¿¡£");
-#else
- msg_print("Life rate is changed.");
-#endif
+ msg_print(_("ä½åã©ã³ã¯ãå¤ãã£ãã", "Life rate is changed."));
p_ptr->knowledge &= ~(KNOW_HPRATE);
}
}
@@ -99,24 +94,52 @@ void do_cmd_rerate(bool display)
#ifdef ALLOW_WIZARD
-/*
- * Dimension Door
+/*!
+ * @brief å¿
ãæåããã¦ã£ã¶ã¼ãã¢ã¼ãç¨æ¬¡å
ã®æå¦ç / Wizard Dimension Door
+ * @return å®éã«ãã¬ãã¼ããè¡ã£ããTRUEãè¿ã
*/
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);
+}
+
+
+/*!
+ * @brief ãã¬ã¤æ¥æ°ãå¤æ´ãã / Set gametime.
+ * @return å®éã«å¤æ´ãè¡ã£ããTRUEãè¿ã
+ */
+static bool set_gametime(void)
+{
+ int tmp_int = 0;
+ char ppp[80], tmp_val[40];
+
+ /* Prompt */
+ sprintf(ppp, "Dungeon Turn (0-%ld): ", dungeon_turn_limit);
+
+ /* Default */
+ sprintf(tmp_val, "%ld", dungeon_turn);
+
+ /* Query */
+ if (!get_string(ppp, tmp_val, 10)) return (FALSE);
+
+ /* Extract */
+ tmp_int = atoi(tmp_val);
+ /* Verify */
+ if (tmp_int >= dungeon_turn_limit) tmp_int = dungeon_turn_limit - 1;
+ else if (tmp_int < 0) tmp_int = 0;
+ dungeon_turn = turn = tmp_int;
return (TRUE);
+
}
-/*
- * Create the artifact of the specified number -- DAN
- *
+/*!
+ * @brief æå®ãããIDã®åºå®ã¢ã¼ãã£ãã¡ã¯ããçæãã / Create the artifact of the specified number
+ * @return ãªã
*/
static void wiz_create_named_art(void)
{
@@ -132,15 +155,16 @@ static void wiz_create_named_art(void)
if(a_idx >= max_a_idx) a_idx = 0;
/* Create the artifact */
- (void)create_named_art(a_idx, py, px);
+ (void)create_named_art(a_idx, p_ptr->y, p_ptr->x);
/* All done */
msg_print("Allocated.");
}
-/*
- * Hack -- quick debugging hook
+/*!
+ * @brief ã¦ã£ã¶ã¼ãã¢ã¼ãç¨ã¢ã³ã¹ã¿ã¼èª¿æ» / Hack -- quick debugging hook
+ * @return ãªã
*/
static void do_cmd_wiz_hack_ben(void)
{
@@ -150,18 +174,20 @@ static void do_cmd_wiz_hack_ben(void)
}
-
#ifdef MONSTER_HORDES
-/* Summon a horde of monsters */
+/*!
+ * @brief ã¦ã£ã¶ã¼ãã¢ã¼ãç¨ã¢ã³ã¹ã¿ã¼ã®ç¾¤ãçæ / Summon a horde of monsters
+ * @return ãªã
+ */
static void do_cmd_summon_horde(void)
{
- int wy = py, wx = px;
+ POSITION wy = p_ptr->y, wx = p_ptr->x;
int attempts = 1000;
while (--attempts)
{
- scatter(&wy, &wx, py, px, 3, 0);
+ scatter(&wy, &wx, p_ptr->y, p_ptr->x, 3, 0);
if (cave_empty_bold(wy, wx)) break;
}
@@ -170,9 +196,9 @@ static void do_cmd_summon_horde(void)
#endif /* MONSTER_HORDES */
-
-/*
- * Output a long int in binary format.
+/*!
+ * @brief 32ãããå¤æ°ã®ãããé
åã並ã¹ã¦æç»ãã / Output a long int in binary format.
+ * @return ãªã
*/
static void prt_binary(u32b flags, int row, int col)
{
@@ -197,19 +223,23 @@ static void prt_binary(u32b flags, int row, int col)
}
-#define K_MAX_DEPTH 110
+#define K_MAX_DEPTH 110 /*!< ã¢ã¤ãã ã®é層æ¯çæçã表示ããæ大é */
-/*
- * Output a rarity graph for a type of object.
+/*!
+ * @brief ã¢ã¤ãã ã®é層æ¯çæçã表示ãã / Output a rarity graph for a type of object.
+ * @param tval ãã¼ã¹ã¢ã¤ãã ã®å¤§é
ç®ID
+ * @param sval ãã¼ã¹ã¢ã¤ãã ã®å°é
ç®ID
+ * @param row 表示å
+ * @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_POSITION row, TERM_POSITION col)
{
int i, j;
int home = 0;
u32b rarity[K_MAX_DEPTH];
u32b total[K_MAX_DEPTH];
- s32b maxd = 1, display[22];
- byte c = TERM_WHITE;
+ s32b display[22];
cptr r = "+---Rate---+";
object_kind *k_ptr;
@@ -289,6 +319,11 @@ static void prt_alloc(byte tval, byte sval, int row, int col)
prt(r, row, col);
}
+/*!
+ * @brief ãã¬ã¤ã¤ã¼ã®è·æ¥ãå¤æ´ãã
+ * @return ãªã
+ * @todo éæ³é åã®åé¸æãªã©ãã¾ã ä¸å®å
¨ãè¦å®è£
ã
+ */
static void do_cmd_wiz_reset_class(void)
{
int tmp_int;
@@ -311,7 +346,7 @@ static void do_cmd_wiz_reset_class(void)
if (tmp_int < 0 || tmp_int >= MAX_CLASS) return;
/* Save it */
- p_ptr->pclass = tmp_int;
+ p_ptr->pclass = (byte_hack)tmp_int;
/* Redraw inscription */
p_ptr->window |= (PW_PLAYER);
@@ -323,8 +358,9 @@ static void do_cmd_wiz_reset_class(void)
}
-/*
- * Hack -- Teleport to the target
+/*!
+ * @brief ã¦ã£ã¶ã¼ãã¢ã¼ãç¨å¦çã¨ãã¦ã¿ã¼ã²ããä¸ã®ç¸æããã¬ãã¼ãããã¯ãã / Hack -- Teleport to the target
+ * @return ãªã
*/
static void do_cmd_wiz_bamf(void)
{
@@ -336,8 +372,10 @@ static void do_cmd_wiz_bamf(void)
}
-/*
+/*!
+ * @brief ãã¬ã¤ã¤ã¼ã®ç¾è½åå¤ã調æ´ãã
* Aux function for "do_cmd_wiz_change()". -RAK-
+ * @return ãªã
*/
static void do_cmd_wiz_change_aux(void)
{
@@ -369,7 +407,7 @@ static void do_cmd_wiz_change_aux(void)
else if (tmp_int < 3) tmp_int = 3;
/* Save it */
- p_ptr->stat_cur[i] = p_ptr->stat_max[i] = tmp_int;
+ p_ptr->stat_cur[i] = p_ptr->stat_max[i] = (s16b)tmp_int;
}
@@ -377,14 +415,10 @@ static void do_cmd_wiz_change_aux(void)
sprintf(tmp_val, "%d", WEAPON_EXP_MASTER);
/* Query */
-#ifdef JP
- if (!get_string("½ÏÎýÅÙ: ", tmp_val, 9)) return;
-#else
- if (!get_string("Proficiency: ", tmp_val, 9)) return;
-#endif
+ if (!get_string(_("ç練度: ", "Proficiency: "), tmp_val, 9)) return;
/* Extract */
- tmp_s16b = atoi(tmp_val);
+ tmp_s16b = (s16b)atoi(tmp_val);
/* Verify */
if (tmp_s16b < WEAPON_EXP_UNSKILLED) tmp_s16b = WEAPON_EXP_UNSKILLED;
@@ -450,8 +484,10 @@ static void do_cmd_wiz_change_aux(void)
}
-/*
+/*!
+ * @brief ãã¬ã¤ã¤ã¼ã®ç¾è½åå¤ã調æ´ãã(ã¡ã¤ã³ã«ã¼ãã³)
* Change various "permanent" player variables.
+ * @return ãªã
*/
static void do_cmd_wiz_change(void)
{
@@ -463,7 +499,12 @@ static void do_cmd_wiz_change(void)
}
-/*
+/*!
+ * @brief ã¢ã¤ãã ã®è©³ç´°ã¹ãã¼ã¿ã¹ã表示ãã /
+ * Change various "permanent" player variables.
+ * @param o_ptr 詳細ã表示ããã¢ã¤ãã æ
å ±ã®åç
§ãã¤ã³ã¿
+ * @return ãªã
+ * @details
* Wizard routines for creating objects -RAK-
* And for manipulating them! -Bernd-
*
@@ -517,9 +558,6 @@ static void do_cmd_wiz_change(void)
*
* Hack -- this function will allow you to create multiple artifacts.
* This "feature" may induce crashes or other nasty effects.
- */
-
-/*
* Just display an item's properties (debug-info)
* Originally by David Reeve Sward
* Verbose item flags by -Bernd-
@@ -597,17 +635,17 @@ static void wiz_display_item(object_type *o_ptr)
}
-/*
- * A structure to hold a tval and its description
+/*!
+ * ãã¼ã¹ã¢ã¤ãã ã®å¤§é
ç®IDã®ç¨®å¥åãã¾ã¨ããæ§é ä½ / A structure to hold a tval and its description
*/
typedef struct tval_desc
{
- int tval;
- cptr desc;
+ int tval; /*!< 大é
ç®ã®ID */
+ cptr desc; /*!< 大é
ç®å */
} tval_desc;
-/*
- * A list of tvals and their textual names
+/*!
+ * ãã¼ã¹ã¢ã¤ãã ã®å¤§é
ç®IDã®ç¨®å¥åå®ç¾© / A list of tvals and their textual names
*/
static tval_desc tvals[] =
{
@@ -666,8 +704,11 @@ static tval_desc tvals[] =
};
-/*
- * Strip an "object name" into a buffer
+/*!
+ * @brief nameãããã¡å
ãããã¼ã¹ã¢ã¤ãã åãè¿ã / Strip an "object name" into a buffer
+ * @param buf ãã¼ã¹ã¢ã¤ãã æ ¼ç´å
ã®åç
§ãã¤ã³ã¿
+ * @param k_idx ãã¼ã¹ã¢ã¤ãã ID
+ * @return ãªã
*/
void strip_name(char *buf, int k_idx)
{
@@ -695,19 +736,20 @@ void strip_name(char *buf, int k_idx)
}
-/*
+/*!
+ * @brief ãã¼ã¹ã¢ã¤ãã ã®ã¦ã£ã¶ã¼ãçæã®ããã«å¤§é
ç®IDã¨å°é
ç®IDãåå¾ãã /
* Specify tval and sval (type and subtype of object) originally
+ * @return ãã¼ã¹ã¢ã¤ãã ID
+ * @details
* by RAK, heavily modified by -Bernd-
- *
* 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 IDX wiz_create_itemtype(void)
{
int i, num, max_num;
int col, row;
- int tval;
+ OBJECT_TYPE_VALUE tval;
cptr tval_desc;
char ch;
@@ -799,46 +841,50 @@ static int wiz_create_itemtype(void)
}
-/*
- * Tweak an item
+/*!
+ * @briefã¢ã¤ãã ã®åºç¤è½åå¤ã調æ´ãã / Tweak an item
+ * @param o_ptr 調æ´ããã¢ã¤ãã ã®åç
§ãã¤ã³ã¿
+ * @return ãªã
*/
static void wiz_tweak_item(object_type *o_ptr)
{
cptr p;
char tmp_val[80];
-
/* Hack -- leave artifacts alone */
if (object_is_artifact(o_ptr)) return;
p = "Enter new 'pval' setting: ";
sprintf(tmp_val, "%d", o_ptr->pval);
if (!get_string(p, tmp_val, 5)) return;
- o_ptr->pval = atoi(tmp_val);
+ o_ptr->pval = (s16b)atoi(tmp_val);
wiz_display_item(o_ptr);
p = "Enter new 'to_a' setting: ";
sprintf(tmp_val, "%d", o_ptr->to_a);
if (!get_string(p, tmp_val, 5)) return;
- o_ptr->to_a = atoi(tmp_val);
+ o_ptr->to_a = (s16b)atoi(tmp_val);
wiz_display_item(o_ptr);
p = "Enter new 'to_h' setting: ";
sprintf(tmp_val, "%d", o_ptr->to_h);
if (!get_string(p, tmp_val, 5)) return;
- o_ptr->to_h = atoi(tmp_val);
+ o_ptr->to_h = (s16b)atoi(tmp_val);
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 = atoi(tmp_val);
+ o_ptr->to_d = (s16b)atoi(tmp_val);
wiz_display_item(o_ptr);
}
-/*
+/*!
+ * @brief ã¢ã¤ãã ã®è³ªãé¸æãã¦åçæãã /
* Apply magic to an item or turn it into an artifact. -Bernd-
+ * @param o_ptr åçæã®å¯¾è±¡ã¨ãªãã¢ã¤ãã æ
å ±ã®åç
§ãã¤ã³ã¿
+ * @return ãªã
*/
static void wiz_reroll_item(object_type *o_ptr)
{
@@ -969,9 +1015,11 @@ static void wiz_reroll_item(object_type *o_ptr)
-/*
+/*!
+ * @brief æ¤æ»å¯¾è±¡ã®ã¢ã¤ãã ãåºæºã¨ããçæãã¹ããè¡ã /
* Try to create an item again. Output some statistics. -Bernd-
- *
+ * @param o_ptr çæãã¹ãã®åºæºã¨ãªãã¢ã¤ãã æ
å ±ã®åç
§ãã¤ã³ã¿
+ * @return ãªã
* The statistics are correct now. We acquire a clean grid, and then
* repeatedly place an object in this grid, copying it into an item
* holder, and then deleting the object. We fiddle with the artifact
@@ -1137,8 +1185,11 @@ static void wiz_statistics(object_type *o_ptr)
}
-/*
+/*!
+ * @brief æ¤æ»å¯¾è±¡ã®ã¢ã¤ãã ã®æ°ãå¤æ´ãã /
* Change the quantity of a the item
+ * @param o_ptr å¤æ´ããã¢ã¤ãã æ
å ±æ§é ä½ã®åç
§ãã¤ã³ã¿
+ * @return ãªã
*/
static void wiz_quantity_item(object_type *o_ptr)
{
@@ -1154,7 +1205,7 @@ static void wiz_quantity_item(object_type *o_ptr)
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))
@@ -1167,7 +1218,7 @@ static void wiz_quantity_item(object_type *o_ptr)
if (tmp_int > 99) tmp_int = 99;
/* Accept modifications */
- o_ptr->number = tmp_int;
+ o_ptr->number = (byte_hack)tmp_int;
}
if (o_ptr->tval == TV_ROD)
@@ -1176,7 +1227,11 @@ static void wiz_quantity_item(object_type *o_ptr)
}
}
-/* debug command for blue mage */
+/*!
+ * @brief ééå°å¸«ã®éæ³ãå
¨ã¦ç¿å¾æ¸ã¿ã«ãã /
+ * debug command for blue mage
+ * @return ãªã
+ */
static void do_cmd_wiz_blue_mage(void)
{
@@ -1205,16 +1260,19 @@ static void do_cmd_wiz_blue_mage(void)
}
-/*
+/*!
+ * @brief ã¢ã¤ãã æ¤æ»ã®ã¡ã¤ã³ã«ã¼ãã³ /
* Play with an item. Options include:
- * - Output statistics (via wiz_roll_item)
- * - Reroll item (via wiz_reroll_item)
- * - Change properties (via wiz_tweak_item)
- * - Change the number of items (via wiz_quantity_item)
+ * @return ãªã
+ * @details
+ * - Output statistics (via wiz_roll_item)
+ * - Reroll item (via wiz_reroll_item)
+ * - Change properties (via wiz_tweak_item)
+ * - Change the number of items (via wiz_quantity_item)
*/
static void do_cmd_wiz_play(void)
{
- int item;
+ OBJECT_IDX item;
object_type forge;
object_type *q_ptr;
@@ -1340,8 +1398,11 @@ static void do_cmd_wiz_play(void)
}
-/*
+/*!
+ * @brief ä»»æã®ãã¼ã¹ã¢ã¤ãã çæã®ã¡ã¤ã³ã«ã¼ãã³ /
* Wizard routine for creating objects -RAK-
+ * @return ãªã
+ * @details
* Heavily modified to allow magification and artifactification -Bernd-
*
* Note that wizards cannot create objects on top of other objects.
@@ -1354,8 +1415,7 @@ static void wiz_create_item(void)
object_type forge;
object_type *q_ptr;
- int k_idx;
-
+ IDX k_idx;
/* Save the screen */
screen_save();
@@ -1366,7 +1426,6 @@ static void wiz_create_item(void)
/* Restore the screen */
screen_load();
-
/* Return if failed */
if (!k_idx) return;
@@ -1384,7 +1443,7 @@ static void wiz_create_item(void)
if (a_info[i].sval != k_info[k_idx].sval) continue;
/* Create this artifact */
- (void)create_named_art(i, py, px);
+ (void)create_named_art(i, p_ptr->y, p_ptr->x);
/* All done */
msg_print("Allocated(INSTA_ART).");
@@ -1403,15 +1462,17 @@ static void wiz_create_item(void)
apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART);
/* Drop the object from heaven */
- (void)drop_near(q_ptr, -1, py, px);
+ (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
/* All done */
msg_print("Allocated.");
}
-/*
+/*!
+ * @brief ãã¬ã¤ã¤ã¼ãå®å
¨å復ãã /
* Cure everything instantly
+ * @return ãªã
*/
static void do_cmd_wiz_cure_all(void)
{
@@ -1466,8 +1527,10 @@ static void do_cmd_wiz_cure_all(void)
}
-/*
+/*!
+ * @brief ä»»æã®ãã³ã¸ã§ã³åã³é層ã«é£ã¶ /
* Go to any level
+ * @return ãªã
*/
static void do_cmd_wiz_jump(void)
{
@@ -1492,18 +1555,19 @@ static void do_cmd_wiz_jump(void)
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 = atoi(tmp_val);
+ command_arg = (s16b)atoi(tmp_val);
- dungeon_type = tmp_dungeon_type;
+ dungeon_type = (byte_hack)tmp_dungeon_type;
}
/* Paranoia */
@@ -1531,7 +1595,7 @@ static void do_cmd_wiz_jump(void)
if (record_stair) do_cmd_write_nikki(NIKKI_WIZ_TELE,0,NULL);
p_ptr->inside_quest = 0;
- energy_use = 0;
+ p_ptr->energy_use = 0;
/* Prevent energy_need from being too lower than 0 */
p_ptr->energy_need = 0;
@@ -1547,12 +1611,14 @@ static void do_cmd_wiz_jump(void)
}
-/*
+/*!
+ * @brief å
¨ãã¼ã¹ã¢ã¤ãã ãéå®æ¸ã¿ã«ãã /
* Become aware of a lot of objects
+ * @return ãªã
*/
static void do_cmd_wiz_learn(void)
{
- int i;
+ IDX i;
object_type forge;
object_type *q_ptr;
@@ -1578,8 +1644,11 @@ static void do_cmd_wiz_learn(void)
}
-/*
+/*!
+ * @brief ç¾å¨ã®ããã¢ã«åã£ãã¢ã³ã¹ã¿ã¼ãã©ã³ãã ã«å¬åãã /
* Summon some creatures
+ * @param num çæå¦çåæ°
+ * @return ãªã
*/
static void do_cmd_wiz_summon(int num)
{
@@ -1587,40 +1656,49 @@ static void do_cmd_wiz_summon(int num)
for (i = 0; i < num; i++)
{
- (void)summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
+ (void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE));
}
}
-/*
+
+/*!
+ * @brief ã¢ã³ã¹ã¿ã¼ã種æIDãæå®ãã¦æµå¯¾çã«å¬åãã /
* Summon a creature of the specified type
- *
+ * @param r_idx ã¢ã³ã¹ã¿ã¼ç¨®æID
+ * @return ãªã
+ * @details
* XXX XXX XXX 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, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
+ (void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
}
-/*
+/*!
+ * @brief ã¢ã³ã¹ã¿ã¼ã種æIDãæå®ãã¦ãããå¬åãã /
* Summon a creature of the specified type
- *
+ * @param r_idx ã¢ã³ã¹ã¿ã¼ç¨®æID
+ * @return ãªã
+ * @details
* XXX XXX XXX 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, py, px, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
+ (void)summon_named_creature(0, p_ptr->y, p_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_FORCE_PET));
}
-/*
+/*!
+ * @brief ãã¬ã¤ã¤ã¼è¿è¾ºã®å
¨ã¢ã³ã¹ã¿ã¼ãæ¶å»ãã /
* Hack -- Delete all nearby monsters
+ * @return ãªã
*/
static void do_cmd_wiz_zap(void)
{
- int i;
+ MONSTER_IDX i;
/* Genocide everyone nearby */
@@ -1651,12 +1729,14 @@ static void do_cmd_wiz_zap(void)
}
-/*
+/*!
+ * @brief ããã¢ã«åå¨ããå
¨ã¢ã³ã¹ã¿ã¼ãæ¶å»ãã /
* Hack -- Delete all monsters
+ * @return ãªã
*/
static void do_cmd_wiz_zap_all(void)
{
- int i;
+ MONSTER_IDX i;
/* Genocide everyone */
for (i = 1; i < m_max; i++)
@@ -1683,8 +1763,10 @@ static void do_cmd_wiz_zap_all(void)
}
-/*
+/*!
+ * @brief æå®ãããå°ç¹ã®å°å½¢IDãå¤æ´ãã /
* Create desired feature
+ * @return ãªã
*/
static void do_cmd_wiz_create_feature(void)
{
@@ -1693,8 +1775,8 @@ static void do_cmd_wiz_create_feature(void)
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;
@@ -1704,14 +1786,10 @@ static void do_cmd_wiz_create_feature(void)
sprintf(tmp_val, "%d", prev_feat);
/* Query */
-#ifdef JP
- if (!get_string("ÃÏ·Á: ", tmp_val, 3)) return;
-#else
- if (!get_string("Feature: ", tmp_val, 3)) return;
-#endif
+ 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;
@@ -1719,19 +1797,15 @@ static void do_cmd_wiz_create_feature(void)
sprintf(tmp_val, "%d", prev_mimic);
/* Query */
-#ifdef JP
- if (!get_string("ÃÏ·Á (mimic): ", tmp_val, 3)) return;
-#else
- if (!get_string("Feature (mimic): ", tmp_val, 3)) return;
-#endif
+ 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;
cave_set_feat(y, x, tmp_feat);
- c_ptr->mimic = tmp_mimic;
+ c_ptr->mimic = (s16b)tmp_mimic;
f_ptr = &f_info[get_feat_mimic(c_ptr)];
@@ -1758,8 +1832,10 @@ static void do_cmd_wiz_create_feature(void)
#define NUM_O_SET 8
#define NUM_O_BIT 32
-/*
+/*!
+ * @brief ç¾å¨ã®ãªãã·ã§ã³è¨å®ããã³ãåºåãã /
* Hack -- Dump option bits usage
+ * @return ãªã
*/
static void do_cmd_dump_options(void)
{
@@ -1780,11 +1856,7 @@ static void do_cmd_dump_options(void)
/* Oops */
if (!fff)
{
-#ifdef JP
- msg_format("¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£", buf);
-#else
- msg_format("Failed to open file %s.", buf);
-#endif
+ msg_format(_("ãã¡ã¤ã« %s ãéãã¾ããã§ããã", "Failed to open file %s."), buf);
msg_print(NULL);
return;
}
@@ -1832,11 +1904,7 @@ static void do_cmd_dump_options(void)
/* Close it */
my_fclose(fff);
-#ifdef JP
- msg_format("¥ª¥×¥·¥ç¥óbit»ÈÍѾõ¶·¤ò¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤½Ð¤·¤Þ¤·¤¿¡£", buf);
-#else
- msg_format("Option bits usage dump saved to file %s.", buf);
-#endif
+ msg_format(_("ãªãã·ã§ã³bit使ç¨ç¶æ³ããã¡ã¤ã« %s ã«æ¸ãåºãã¾ããã", "Option bits usage dump saved to file %s."), buf);
}
@@ -1858,16 +1926,17 @@ extern void do_cmd_debug(void);
-/*
+/*!
+ * @brief ãããã°ã³ãã³ããé¸æããå¦çã®ã¡ã¤ã³ã«ã¼ãã³ /
* Ask for and parse a "debug command"
* The "command_arg" may have been set.
+ * @return ãªã
*/
void do_cmd_debug(void)
{
int x, y;
char cmd;
-
/* Get a "debug command" */
get_com("Debug Command: ", &cmd, FALSE);
@@ -1960,7 +2029,7 @@ void do_cmd_debug(void)
/* Good Objects */
case 'g':
if (command_arg <= 0) command_arg = 1;
- acquirement(py, px, command_arg, FALSE, FALSE, TRUE);
+ acquirement(p_ptr->y, p_ptr->x, command_arg, FALSE, FALSE, TRUE);
break;
/* Hitpoint rerating */
@@ -2039,26 +2108,22 @@ void do_cmd_debug(void)
teleport_player(10, 0L);
break;
-#if 0
/* Complete a Quest -KMW- */
case 'q':
- for (i = 0; i < max_quests; i++)
+ if(p_ptr->inside_quest)
{
- if (p_ptr->quest[i].status == QUEST_STATUS_TAKEN)
+ if (quest[p_ptr->inside_quest].status == QUEST_STATUS_TAKEN)
{
- p_ptr->quest[i].status++;
- msg_print("Completed Quest");
- msg_print(NULL);
+ complete_quest(p_ptr->inside_quest);
break;
}
}
- if (i == max_quests)
+ else
{
msg_print("No current quest");
msg_print(NULL);
}
break;
-#endif
/* Make every dungeon square "known" to test streamers -KMW- */
case 'u':
@@ -2081,7 +2146,7 @@ void do_cmd_debug(void)
/* Special(Random Artifact) Objects */
case 'S':
if (command_arg <= 0) command_arg = 1;
- acquirement(py, px, command_arg, TRUE, TRUE, TRUE);
+ acquirement(p_ptr->y, p_ptr->x, command_arg, TRUE, TRUE, TRUE);
break;
/* Teleport */
@@ -2089,10 +2154,16 @@ void do_cmd_debug(void)
teleport_player(100, 0L);
break;
+ /* Game Time Setting */
+ case 'T':
+ set_gametime();
+ break;
+
+
/* Very Good Objects */
case 'v':
if (command_arg <= 0) command_arg = 1;
- acquirement(py, px, command_arg, TRUE, FALSE, TRUE);
+ acquirement(p_ptr->y, p_ptr->x, command_arg, TRUE, FALSE, TRUE);
break;
/* Wizard Light the Level */