• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision71736d8528cfeecf5355c81b3d3fc21f85331338 (tree)
Time2019-06-15 19:35:46
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

Merge branch '#39321' into For2.2.2-Refactoring

Change Summary

Incremental Difference

--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -345,7 +345,7 @@ const activation_type activation_info[] =
345345 * the user hits "escape" at the "direction" prompt.
346346 * </pre>
347347 */
348-void do_cmd_activate_aux(player_type *user_ptr, INVENTORY_IDX item)
348+void exe_activate(player_type *user_ptr, INVENTORY_IDX item)
349349 {
350350 DIRECTION dir;
351351 DEPTH lev;
@@ -651,7 +651,7 @@ void do_cmd_activate(void)
651651 if (!choose_object(&item, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0)) return;
652652
653653 /* Activate the item */
654- do_cmd_activate_aux(p_ptr, item);
654+ exe_activate(p_ptr, item);
655655 }
656656
657657 /*!
--- a/src/cmd-activate.h
+++ b/src/cmd-activate.h
@@ -1,7 +1,7 @@
11 #pragma once
22
33 extern void do_cmd_activate(void);
4-extern void do_cmd_activate_aux(player_type *user_ptr, INVENTORY_IDX item);
4+extern void exe_activate(player_type *user_ptr, INVENTORY_IDX item);
55 extern bool activate_artifact(object_type * o_ptr);
66
77 typedef struct {
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -31,7 +31,7 @@
3131 * @param item 食べるオブジェクトの所持品ID
3232 * @return なし
3333 */
34-void do_cmd_eat_food_aux(INVENTORY_IDX item)
34+void exe_eat_food(INVENTORY_IDX item)
3535 {
3636 int ident, lev;
3737 object_type *o_ptr;
@@ -524,6 +524,6 @@ void do_cmd_eat_food(void)
524524 if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), 0)) return;
525525
526526 /* Eat the object */
527- do_cmd_eat_food_aux(item);
527+ exe_eat_food(item);
528528 }
529529
--- a/src/cmd-eat.h
+++ b/src/cmd-eat.h
@@ -1,3 +1,3 @@
11 
22 extern void do_cmd_eat_food(void);
3-extern void do_cmd_eat_food_aux(INVENTORY_IDX item);
3+extern void exe_eat_food(INVENTORY_IDX item);
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1549,29 +1549,29 @@ void do_cmd_use(void)
15491549 break;
15501550
15511551 case TV_FOOD:
1552- do_cmd_eat_food_aux(item);
1552+ exe_eat_food(item);
15531553 break;
15541554
15551555 case TV_WAND:
1556- do_cmd_aim_wand_aux(item);
1556+ exe_aim_wand(item);
15571557 break;
15581558
15591559 case TV_STAFF:
1560- do_cmd_use_staff_aux(item);
1560+ exe_use_staff(item);
15611561 break;
15621562
15631563 case TV_ROD:
1564- do_cmd_zap_rod_aux(item);
1564+ exe_zap_rod(item);
15651565 break;
15661566
15671567 case TV_POTION:
1568- do_cmd_quaff_potion_aux(item);
1568+ exe_quaff_potion(item);
15691569 break;
15701570
15711571 case TV_SCROLL:
15721572 if (cmd_limit_blind(p_ptr)) return;
15731573 if (cmd_limit_confused(p_ptr)) return;
1574- do_cmd_read_scroll_aux(item, TRUE);
1574+ exe_read(item, TRUE);
15751575 break;
15761576
15771577 case TV_SHOT:
@@ -1581,7 +1581,7 @@ void do_cmd_use(void)
15811581 break;
15821582
15831583 default:
1584- do_cmd_activate_aux(p_ptr, item);
1584+ exe_activate(p_ptr, item);
15851585 break;
15861586 }
15871587 }
--- 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-read.c
+++ b/src/cmd-read.c
@@ -46,7 +46,7 @@
4646 * cancelled before use. XXX Reading them still takes a current_world_ptr->game_turn, though.
4747 * </pre>
4848 */
49-void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
49+void exe_read(INVENTORY_IDX item, bool known)
5050 {
5151 int k, used_up, ident, lev;
5252 object_type *o_ptr;
@@ -650,5 +650,5 @@ void do_cmd_read_scroll(void)
650650 if (!o_ptr) return;
651651
652652 /* Read the scroll */
653- do_cmd_read_scroll_aux(item, object_is_aware(o_ptr));
653+ exe_read(item, object_is_aware(o_ptr));
654654 }
--- a/src/cmd-read.h
+++ b/src/cmd-read.h
@@ -1,4 +1,4 @@
11 
22
3-extern void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known);
3+extern void exe_read(INVENTORY_IDX item, bool known);
44 extern void do_cmd_read_scroll(void);
--- 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;
@@ -447,5 +447,5 @@ void do_cmd_use_staff(void)
447447 s = _("使える杖がない。", "You have no staff to use.");
448448 if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_STAFF)) return;
449449
450- do_cmd_use_staff_aux(item);
450+ exe_use_staff(item);
451451 }
--- 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;
@@ -421,5 +421,5 @@ void do_cmd_zap_rod(void)
421421 if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_ROD)) return;
422422
423423 /* Zap the rod */
424- do_cmd_zap_rod_aux(item);
424+ exe_zap_rod(item);
425425 }
--- 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