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
/
cmd-item.c
diff --git
a/src/cmd-item.c
b/src/cmd-item.c
index
65725d4
..
90ef96f
100644
(file)
--- a/
src/cmd-item.c
+++ b/
src/cmd-item.c
@@
-21,6
+21,7
@@
#include "cmd-zaprod.h"
#include "cmd-zapwand.h"
#include "cmd-zaprod.h"
#include "cmd-zapwand.h"
+#include "player-item.h"
#include "object-hook.h"
#include "object-hook.h"
@@
-36,13
+37,9
@@
void do_cmd_inven(void)
/* Note that we are in "inventory" mode */
command_wrk = FALSE;
/* Note that we are in "inventory" mode */
command_wrk = FALSE;
-#ifdef ALLOW_EASY_FLOOR
-
/* Note that we are in "inventory" mode */
if (easy_floor) command_wrk = (USE_INVEN);
/* Note that we are in "inventory" mode */
if (easy_floor) command_wrk = (USE_INVEN);
-#endif /* ALLOW_EASY_FLOOR */
-
/* Save screen */
screen_save();
/* Save screen */
screen_save();
@@
-81,7
+78,6
@@
void do_cmd_inven(void)
{
int wid, hgt;
{
int wid, hgt;
- /* Get size */
Term_get_size(&wid, &hgt);
/* Reset stuff */
Term_get_size(&wid, &hgt);
/* Reset stuff */
@@
-110,13
+106,9
@@
void do_cmd_equip(void)
/* Note that we are in "equipment" mode */
command_wrk = TRUE;
/* Note that we are in "equipment" mode */
command_wrk = TRUE;
-#ifdef ALLOW_EASY_FLOOR
-
/* Note that we are in "equipment" mode */
if (easy_floor) command_wrk = (USE_EQUIP);
/* Note that we are in "equipment" mode */
if (easy_floor) command_wrk = (USE_EQUIP);
-#endif /* ALLOW_EASY_FLOOR */
-
/* Save the screen */
screen_save();
/* Save the screen */
screen_save();
@@
-156,7
+148,6
@@
void do_cmd_equip(void)
{
int wid, hgt;
{
int wid, hgt;
- /* Get size */
Term_get_size(&wid, &hgt);
/* Reset stuff */
Term_get_size(&wid, &hgt);
/* Reset stuff */
@@
-206,7
+197,6
@@
void do_cmd_wield(void)
/* Restrict the choices */
item_tester_hook = item_tester_hook_wear;
/* Restrict the choices */
item_tester_hook = item_tester_hook_wear;
- /* Get an item */
q = _("どれを装備しますか? ", "Wear/Wield which item? ");
s = _("装備可能なアイテムがない。", "You have nothing you can wear or wield.");
q = _("どれを装備しますか? ", "Wear/Wield which item? ");
s = _("装備可能なアイテムがない。", "You have nothing you can wear or wield.");
@@
-605,7
+595,6
@@
void do_cmd_takeoff(void)
item_tester_no_ryoute = TRUE;
item_tester_no_ryoute = TRUE;
- /* Get an item */
q = _("どれを装備からはずしますか? ", "Take off which item? ");
s = _("はずせる装備がない。", "You are not wearing anything to take off.");
q = _("どれを装備からはずしますか? ", "Take off which item? ");
s = _("はずせる装備がない。", "You are not wearing anything to take off.");
@@
-629,10
+618,8
@@
void do_cmd_takeoff(void)
{
if ((o_ptr->curse_flags & TRC_PERMA_CURSE) || (p_ptr->pclass != CLASS_BERSERKER))
{
{
if ((o_ptr->curse_flags & TRC_PERMA_CURSE) || (p_ptr->pclass != CLASS_BERSERKER))
{
- /* Oops */
msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed."));
msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed."));
- /* Nope */
return;
}
return;
}
@@
-693,7
+680,6
@@
void do_cmd_drop(void)
}
item_tester_no_ryoute = TRUE;
}
item_tester_no_ryoute = TRUE;
- /* Get an item */
q = _("どのアイテムを落としますか? ", "Drop which item? ");
s = _("落とせるアイテムを持っていない。", "You have nothing to drop.");
q = _("どのアイテムを落としますか? ", "Drop which item? ");
s = _("落とせるアイテムを持っていない。", "You have nothing to drop.");
@@
-715,9
+701,7
@@
void do_cmd_drop(void)
/* Hack -- Cannot remove cursed items */
if ((item >= INVEN_RARM) && object_is_cursed(o_ptr))
{
/* Hack -- Cannot remove cursed items */
if ((item >= INVEN_RARM) && object_is_cursed(o_ptr))
{
- /* Oops */
msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed."));
msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed."));
- /* Nope */
return;
}
return;
}
@@
-806,7
+790,6
@@
void do_cmd_destroy(void)
/* Hack -- force destruction */
if (command_arg > 0) force = TRUE;
/* Hack -- force destruction */
if (command_arg > 0) force = TRUE;
- /* Get an item */
q = _("どのアイテムを壊しますか? ", "Destroy which item? ");
s = _("壊せるアイテムを持っていない。", "You have nothing to destroy.");
q = _("どのアイテムを壊しますか? ", "Destroy which item? ");
s = _("壊せるアイテムを持っていない。", "You have nothing to destroy.");
@@
-887,7
+870,6
@@
void do_cmd_destroy(void)
}
}
- /* Describe the object */
old_number = o_ptr->number;
o_ptr->number = amt;
object_desc(o_name, o_ptr, 0);
old_number = o_ptr->number;
o_ptr->number = amt;
object_desc(o_name, o_ptr, 0);
@@
-1003,7
+985,6
@@
void do_cmd_observe(void)
item_tester_no_ryoute = TRUE;
item_tester_no_ryoute = TRUE;
- /* Get an item */
q = _("どのアイテムを調べますか? ", "Examine which item? ");
s = _("調べられるアイテムがない。", "You have nothing to examine.");
q = _("どのアイテムを調べますか? ", "Examine which item? ");
s = _("調べられるアイテムがない。", "You have nothing to examine.");
@@
-1053,7
+1034,6
@@
void do_cmd_uninscribe(void)
cptr q, s;
item_tester_no_ryoute = TRUE;
cptr q, s;
item_tester_no_ryoute = TRUE;
- /* Get an item */
q = _("どのアイテムの銘を消しますか? ", "Un-inscribe which item? ");
s = _("銘を消せるアイテムがない。", "You have nothing to un-inscribe.");
q = _("どのアイテムの銘を消しますか? ", "Un-inscribe which item? ");
s = _("銘を消せるアイテムがない。", "You have nothing to un-inscribe.");
@@
-1108,7
+1088,6
@@
void do_cmd_inscribe(void)
cptr q, s;
item_tester_no_ryoute = TRUE;
cptr q, s;
item_tester_no_ryoute = TRUE;
- /* Get an item */
q = _("どのアイテムに銘を刻みますか? ", "Inscribe which item? ");
s = _("銘を刻めるアイテムがない。", "You have nothing to inscribe.");
q = _("どのアイテムに銘を刻みますか? ", "Inscribe which item? ");
s = _("銘を刻めるアイテムがない。", "You have nothing to inscribe.");
@@
-1198,7
+1177,6
@@
static void do_cmd_refill_lamp(void)
/* Restrict the choices */
item_tester_hook = item_tester_refill_lantern;
/* Restrict the choices */
item_tester_hook = item_tester_refill_lantern;
- /* Get an item */
#ifdef JP
q = "どの油つぼから注ぎますか? ";
s = "油つぼがない。";
#ifdef JP
q = "どの油つぼから注ぎますか? ";
s = "油つぼがない。";
@@
-1233,7
+1211,6
@@
static void do_cmd_refill_lamp(void)
msg_print(_("ランプに油を注いだ。", "You fuel your lamp."));
msg_print(_("ランプに油を注いだ。", "You fuel your lamp."));
- /* Comment */
if ((o_ptr->name2 == EGO_LITE_DARKNESS) && (j_ptr->xtra4 > 0))
{
j_ptr->xtra4 = 0;
if ((o_ptr->name2 == EGO_LITE_DARKNESS) && (j_ptr->xtra4 > 0))
{
j_ptr->xtra4 = 0;
@@
-1302,18
+1279,11
@@
static void do_cmd_refill_torch(void)
cptr q, s;
cptr q, s;
-
/* Restrict the choices */
item_tester_hook = item_tester_refill_torch;
/* Restrict the choices */
item_tester_hook = item_tester_refill_torch;
- /* Get an item */
-#ifdef JP
- q = "どの松明で明かりを強めますか? ";
- s = "他に松明がない。";
-#else
- q = "Refuel with which torch? ";
- s = "You have no extra torches.";
-#endif
+ q = _("どの松明で明かりを強めますか? ", "Refuel with which torch? ");
+ s = _("他に松明がない。", "You have no extra torches.");
if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
@@
-1341,7
+1311,6
@@
static void do_cmd_refill_torch(void)
msg_print(_("松明を結合した。", "You combine the torches."));
msg_print(_("松明を結合した。", "You combine the torches."));
- /* Comment */
if ((o_ptr->name2 == EGO_LITE_DARKNESS) && (j_ptr->xtra4 > 0))
{
j_ptr->xtra4 = 0;
if ((o_ptr->name2 == EGO_LITE_DARKNESS) && (j_ptr->xtra4 > 0))
{
j_ptr->xtra4 = 0;
@@
-1486,7
+1455,6
@@
void do_cmd_locate(void)
int wid, hgt;
int wid, hgt;
- /* Get size */
get_screen_size(&wid, &hgt);
get_screen_size(&wid, &hgt);
@@
-1694,7
+1662,7
@@
void ang_sort_swap_hook(vptr u, vptr v, int a, int b)
*
* The responses may be sorted in several ways, see below.
*
*
* The responses may be sorted in several ways, see below.
*
- * Note that the player ghosts are ignored.
XXX XXX XXX
+ * Note that the player ghosts are ignored.
* </pre>
*/
void do_cmd_query_symbol(void)
* </pre>
*/
void do_cmd_query_symbol(void)
@@
-1834,7
+1802,7
@@
void do_cmd_query_symbol(void)
}
}
- /* Prompt
XXX XXX XXX
*/
+ /* Prompt */
put_str(_("思い出を見ますか? (k:殺害順/y/n): ", "Recall details? (k/y/n): "), 0, _(36, 40));
put_str(_("思い出を見ますか? (k:殺害順/y/n): ", "Recall details? (k/y/n): "), 0, _(36, 40));
@@
-1985,7
+1953,6
@@
void do_cmd_use(void)
/* Prepare the hook */
item_tester_hook = item_tester_hook_use;
/* Prepare the hook */
item_tester_hook = item_tester_hook_use;
- /* Get an item */
q = _("どれを使いますか?", "Use which item? ");
s = _("使えるものがありません。", "You have nothing to use.");
q = _("どれを使いますか?", "Use which item? ");
s = _("使えるものがありません。", "You have nothing to use.");