• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision3de53ba753bbdcb7dc1b0d0b8406dbc9230699e0 (tree)
Time2019-08-18 15:19:41
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #38997 引数参照を修正.

Change Summary

Incremental Difference

--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -401,7 +401,7 @@ void do_cmd_gain_hissatsu(player_type *creature_ptr)
401401 q = _("どの書から学びますか? ", "Study which book? ");
402402 s = _("読める書がない。", "You have no books that you can read.");
403403
404- o_ptr = choose_object(p_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_HISSATSU_BOOK);
404+ o_ptr = choose_object(creature_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_HISSATSU_BOOK);
405405 if (!o_ptr) return;
406406
407407 for (i = o_ptr->sval * 8; i < o_ptr->sval * 8 + 8; i++)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -51,7 +51,7 @@
5151 #include "player-inventory.h"
5252
5353 /*!
54- * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display p_ptr->inventory_list
54+ * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display inventory_list
5555 * @return なし
5656 */
5757 void do_cmd_inven(player_type *creature_ptr)
@@ -163,7 +163,7 @@ void do_cmd_wield(player_type *creature_ptr)
163163 q = _("どれを装備しますか? ", "Wear/Wield which item? ");
164164 s = _("装備可能なアイテムがない。", "You have nothing you can wear or wield.");
165165
166- o_ptr = choose_object(p_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0);
166+ o_ptr = choose_object(creature_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0);
167167 if (!o_ptr) return;
168168
169169 /* Check the slot */
@@ -184,7 +184,7 @@ void do_cmd_wield(player_type *creature_ptr)
184184 /* Choose a weapon from the equipment only */
185185 q = _("どちらの武器と取り替えますか?", "Replace which weapon? ");
186186 s = _("おっと。", "Oops.");
187- if (!choose_object(p_ptr, &slot, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0)) return;
187+ if (!choose_object(creature_ptr, &slot, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0)) return;
188188 if (slot == INVEN_RARM) need_switch_wielding = INVEN_LARM;
189189 }
190190
@@ -200,7 +200,7 @@ void do_cmd_wield(player_type *creature_ptr)
200200 /* Choose a hand */
201201 q = _("どちらの手に装備しますか?", "Equip which hand? ");
202202 s = _("おっと。", "Oops.");
203- if (!choose_object(p_ptr, &slot, q, s, (USE_EQUIP), 0)) return;
203+ if (!choose_object(creature_ptr, &slot, q, s, (USE_EQUIP), 0)) return;
204204 }
205205 break;
206206
@@ -230,7 +230,7 @@ void do_cmd_wield(player_type *creature_ptr)
230230 q = _("どちらの手に装備しますか?", "Equip which hand? ");
231231 s = _("おっと。", "Oops.");
232232
233- if (!choose_object(p_ptr, &slot, q, s, (USE_EQUIP), 0)) return;
233+ if (!choose_object(creature_ptr, &slot, q, s, (USE_EQUIP), 0)) return;
234234 if ((slot == INVEN_LARM) && !has_melee_weapon(creature_ptr, INVEN_RARM))
235235 need_switch_wielding = INVEN_RARM;
236236 }
@@ -252,7 +252,7 @@ void do_cmd_wield(player_type *creature_ptr)
252252 /* Restrict the choices */
253253 select_ring_slot = TRUE;
254254
255- if (!choose_object(p_ptr, &slot, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0))
255+ if (!choose_object(creature_ptr, &slot, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0))
256256 {
257257 select_ring_slot = FALSE;
258258 return;
@@ -510,7 +510,7 @@ void do_cmd_takeoff(player_type *creature_ptr)
510510 q = _("どれを装備からはずしますか? ", "Take off which item? ");
511511 s = _("はずせる装備がない。", "You are not wearing anything to take off.");
512512
513- o_ptr = choose_object(p_ptr, &item, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0);
513+ o_ptr = choose_object(creature_ptr, &item, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0);
514514 if (!o_ptr) return;
515515
516516 /* Item is cursed */
@@ -638,7 +638,7 @@ void do_cmd_destroy(player_type *creature_ptr)
638638 q = _("どのアイテムを壊しますか? ", "Destroy which item? ");
639639 s = _("壊せるアイテムを持っていない。", "You have nothing to destroy.");
640640
641- o_ptr = choose_object(p_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0);
641+ o_ptr = choose_object(creature_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0);
642642 if (!o_ptr) return;
643643
644644 /* Verify unless quantity given beforehand */
Show on old repository browser