• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisionf512db4ee1e659c6e0b4b046d4cdf662c6b2146b (tree)
Time2019-06-15 17:59:05
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #39321 do_cmd_quaff_potion_aux() を exe_quaff_potion(), do_cmd_use_staff_aux() を exe_use_staff(), do_cmd_zap_rod_aux() を exe_zap_rod_staff(), do_cmd_aim_wand_aux() を exe_aim_wand() に改名.

Change Summary

Incremental Difference

--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1563,28 +1563,28 @@ void do_cmd_use(void)
15631563 /* Aim a wand */
15641564 case TV_WAND:
15651565 {
1566- do_cmd_aim_wand_aux(item);
1566+ exe_aim_wand(item);
15671567 break;
15681568 }
15691569
15701570 /* Use a staff */
15711571 case TV_STAFF:
15721572 {
1573- do_cmd_use_staff_aux(item);
1573+ exe_use_staff(item);
15741574 break;
15751575 }
15761576
15771577 /* Zap a rod */
15781578 case TV_ROD:
15791579 {
1580- do_cmd_zap_rod_aux(item);
1580+ exe_zap_rod(item);
15811581 break;
15821582 }
15831583
15841584 /* Quaff a potion */
15851585 case TV_POTION:
15861586 {
1587- do_cmd_quaff_potion_aux(item);
1587+ exe_quaff_potion(item);
15881588 break;
15891589 }
15901590
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -36,7 +36,7 @@
3636 * @param item 飲む薬オブジェクトの所持品ID
3737 * @return なし
3838 */
39-void do_cmd_quaff_potion_aux(INVENTORY_IDX item)
39+void exe_quaff_potion(INVENTORY_IDX item)
4040 {
4141 bool ident;
4242 DEPTH lev;
@@ -622,5 +622,5 @@ void do_cmd_quaff_potion(void)
622622 if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), 0)) return;
623623
624624 /* Quaff the potion */
625- do_cmd_quaff_potion_aux(item);
625+ exe_quaff_potion(item);
626626 }
--- a/src/cmd-quaff.h
+++ b/src/cmd-quaff.h
@@ -1,4 +1,4 @@
11 
22 extern void do_cmd_quaff_potion(void);
3-extern void do_cmd_quaff_potion_aux(INVENTORY_IDX item);
3+extern void exe_quaff_potion(INVENTORY_IDX item);
44
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -280,7 +280,7 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
280280 * One charge of one staff disappears.
281281 * Hack -- staffs of identify can be "cancelled".
282282 */
283-void do_cmd_use_staff_aux(INVENTORY_IDX item)
283+void exe_use_staff(INVENTORY_IDX item)
284284 {
285285 int ident, chance, lev;
286286 object_type *o_ptr;
@@ -448,5 +448,5 @@ void do_cmd_use_staff(void)
448448 s = _("使える杖がない。", "You have no staff to use.");
449449 if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_STAFF)) return;
450450
451- do_cmd_use_staff_aux(item);
451+ exe_use_staff(item);
452452 }
--- a/src/cmd-usestaff.h
+++ b/src/cmd-usestaff.h
@@ -1,3 +1,3 @@
11 extern int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known);
2-extern void do_cmd_use_staff_aux(INVENTORY_IDX item);
2+extern void exe_use_staff(INVENTORY_IDX item);
33 extern void do_cmd_use_staff(void);
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -268,7 +268,7 @@ int rod_effect(OBJECT_SUBTYPE_VALUE sval, DIRECTION dir, bool *use_charge, bool
268268 * pvals are defined for each rod in k_info. -LM-
269269 * </pre>
270270 */
271-void do_cmd_zap_rod_aux(INVENTORY_IDX item)
271+void exe_zap_rod(INVENTORY_IDX item)
272272 {
273273 int ident, chance, lev, fail;
274274 DIRECTION dir = 0;
@@ -422,5 +422,5 @@ void do_cmd_zap_rod(void)
422422 if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_ROD)) return;
423423
424424 /* Zap the rod */
425- do_cmd_zap_rod_aux(item);
425+ exe_zap_rod(item);
426426 }
--- a/src/cmd-zaprod.h
+++ b/src/cmd-zaprod.h
@@ -1,3 +1,3 @@
11 extern int rod_effect(OBJECT_SUBTYPE_VALUE sval, DIRECTION dir, bool *use_charge, bool powerful, bool magic);
2-extern void do_cmd_zap_rod_aux(INVENTORY_IDX item);
2+extern void exe_zap_rod(INVENTORY_IDX item);
33 extern void do_cmd_zap_rod(void);
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -326,7 +326,7 @@ bool wand_effect(OBJECT_SUBTYPE_VALUE sval, DIRECTION dir, bool powerful, bool m
326326 * as the basic "ball" rods.
327327 * </pre>
328328 */
329-void do_cmd_aim_wand_aux(INVENTORY_IDX item)
329+void exe_aim_wand(INVENTORY_IDX item)
330330 {
331331 DEPTH lev;
332332 int ident, chance;
@@ -470,5 +470,5 @@ void do_cmd_aim_wand(void)
470470 s = _("使える魔法棒がない。", "You have no wand to aim.");
471471 if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_WAND)) return;
472472
473- do_cmd_aim_wand_aux(item);
473+ exe_aim_wand(item);
474474 }
--- a/src/cmd-zapwand.h
+++ b/src/cmd-zapwand.h
@@ -1,3 +1,3 @@
11 extern bool wand_effect(OBJECT_SUBTYPE_VALUE sval, DIRECTION dir, bool powerful, bool magic);
2-extern void do_cmd_aim_wand_aux(INVENTORY_IDX item);
2+extern void exe_aim_wand(INVENTORY_IDX item);
33 extern void do_cmd_aim_wand(void);
Show on old repository browser