• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision188488293d5afb53a6c20dda31feafb844af35d9 (tree)
Time2019-05-03 12:44:15
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 cmd4.c を cmd-dump.c に改名して関数整理.

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -143,6 +143,7 @@
143143 <ClCompile Include="..\..\src\chuukei.c" />
144144 <ClCompile Include="..\..\src\cmd-activate.c" />
145145 <ClCompile Include="..\..\src\cmd-basic.c" />
146+ <ClCompile Include="..\..\src\cmd-dump.c" />
146147 <ClCompile Include="..\..\src\cmd-eat.c" />
147148 <ClCompile Include="..\..\src\cmd-hissatsu.c" />
148149 <ClCompile Include="..\..\src\cmd-mane.c" />
@@ -204,6 +205,7 @@
204205 <ClInclude Include="..\..\src\chest.h" />
205206 <ClInclude Include="..\..\src\chuukei.h" />
206207 <ClInclude Include="..\..\src\cmd-basic.h" />
208+ <ClInclude Include="..\..\src\cmd-dump.h" />
207209 <ClInclude Include="..\..\src\cmd-hissatsu.h" />
208210 <ClInclude Include="..\..\src\cmd-item.h" />
209211 <ClInclude Include="..\..\src\cmd-magiceat.h" />
@@ -217,7 +219,6 @@
217219 </ClInclude>
218220 <ClCompile Include="..\..\src\player-move.c" />
219221 <ClCompile Include="..\..\src\cmd-item.c" />
220- <ClCompile Include="..\..\src\cmd4.c" />
221222 <ClCompile Include="..\..\src\cmd-magiceat.c" />
222223 <ClCompile Include="..\..\src\cmd-spell.c" />
223224 <ClCompile Include="..\..\src\files.c" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -31,9 +31,6 @@
3131 <ClCompile Include="..\..\src\z-util.c" />
3232 <ClCompile Include="..\..\src\z-virt.c" />
3333 <ClCompile Include="..\..\src\warning.c" />
34- <ClCompile Include="..\..\src\cmd4.c">
35- <Filter>cmd</Filter>
36- </ClCompile>
3734 <ClCompile Include="..\..\src\cmd-activate.c">
3835 <Filter>cmd</Filter>
3936 </ClCompile>
@@ -345,6 +342,9 @@
345342 <ClCompile Include="..\..\src\player-sex.c">
346343 <Filter>player</Filter>
347344 </ClCompile>
345+ <ClCompile Include="..\..\src\cmd-dump.c">
346+ <Filter>cmd</Filter>
347+ </ClCompile>
348348 </ItemGroup>
349349 <ItemGroup>
350350 <ClInclude Include="..\..\src\angband.h" />
@@ -655,6 +655,9 @@
655655 <ClInclude Include="..\..\src\player-sex.h">
656656 <Filter>player</Filter>
657657 </ClInclude>
658+ <ClInclude Include="..\..\src\cmd-dump.h">
659+ <Filter>cmd</Filter>
660+ </ClInclude>
658661 </ItemGroup>
659662 <ItemGroup>
660663 <ResourceCompile Include="..\..\src\angband.rc" />
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,7 @@ hengband_SOURCES = \
1212 avatar.h avatar.c birth.c birth.h \
1313 \
1414 bldg.c bldg.h chest.c chest.h chuukei.c \
15- cmd-basic.c cmd-basic.h cmd4.c cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
15+ cmd-basic.c cmd-basic.h cmd-dump.c cmd-dump.h cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
1616 cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h \
1717 cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h \
1818 cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \
--- a/src/birth.c
+++ b/src/birth.c
@@ -17,6 +17,7 @@
1717
1818 #include "artifact.h"
1919 #include "avatar.h"
20+#include "cmd-dump.h"
2021 #include "history.h"
2122 #include "monsterrace-hook.h"
2223 #include "store.h"
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -15,6 +15,7 @@
1515 #include "angband.h"
1616 #include "util.h"
1717
18+#include "cmd-dump.h"
1819 #include "floor.h"
1920 #include "floor-events.h"
2021 #include "floor-save.h"
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -9,6 +9,7 @@
99 #include "angband.h"
1010
1111 #include "util.h"
12+#include "cmd-dump.h"
1213
1314 #include <stdio.h>
1415 #include <stdarg.h>
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -13,6 +13,7 @@
1313 #include "angband.h"
1414 #include "util.h"
1515
16+#include "cmd-dump.h"
1617 #include "chest.h"
1718 #include "trap.h"
1819 #include "dungeon.h"
--- a/src/cmd4.c
+++ b/src/cmd-dump.c
@@ -41,6 +41,8 @@
4141
4242 #include "angband.h"
4343 #include "util.h"
44+#include "cmd-dump.h"
45+
4446 #include "autopick.h"
4547
4648 #include "birth.h"
--- /dev/null
+++ b/src/cmd-dump.h
@@ -0,0 +1,32 @@
1+#pragma once
2+
3+/* cmd4.c */
4+#ifndef JP
5+extern concptr get_ordinal_number_suffix(int num);
6+#endif
7+extern errr do_cmd_write_nikki(int type, int num, concptr note);
8+extern void do_cmd_nikki(void);
9+extern void do_cmd_redraw(void);
10+extern void do_cmd_change_name(void);
11+extern void do_cmd_message_one(void);
12+extern void do_cmd_messages(int num_now);
13+extern void do_cmd_options_aux(int page, concptr info);
14+extern void do_cmd_options(void);
15+extern void do_cmd_pref(void);
16+extern void do_cmd_reload_autopick(void);
17+extern void do_cmd_macros(void);
18+extern void do_cmd_visuals(void);
19+extern void do_cmd_colors(void);
20+extern void do_cmd_note(void);
21+extern void do_cmd_version(void);
22+extern void do_cmd_feeling(void);
23+extern void do_cmd_load_screen(void);
24+extern void do_cmd_save_screen_html_aux(char *filename, int message);
25+extern void do_cmd_save_screen(void);
26+extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]);
27+extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]);
28+extern void do_cmd_knowledge(void);
29+extern void plural_aux(char * Name);
30+extern void do_cmd_checkquest(void);
31+extern void do_cmd_time(void);
32+extern void do_cmd_suicide(void);
\ No newline at end of file
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -1,6 +1,7 @@
11 #include "angband.h"
22 #include "util.h"
33
4+#include "cmd-dump.h"
45 #include "floor.h"
56 #include "grid.h"
67 #include "melee.h"
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -9,6 +9,7 @@
99 #include "angband.h"
1010 #include "util.h"
1111
12+#include "cmd-dump.h"
1213 #include "selfinfo.h"
1314 #include "spells.h"
1415 #include "spells-summon.h"
--- a/src/core.c
+++ b/src/core.c
@@ -16,6 +16,7 @@
1616 #include "birth.h"
1717 #include "bldg.h"
1818 #include "cmd-activate.h"
19+#include "cmd-dump.h"
1920 #include "cmd-eat.h"
2021 #include "cmd-hissatsu.h"
2122 #include "cmd-item.h"
--- a/src/externs.h
+++ b/src/externs.h
@@ -276,36 +276,6 @@ extern FEAT_IDX feat_ground_type[100], feat_wall_type[100];
276276 extern COMMAND_CODE now_message;
277277 extern bool use_menu;
278278
279-/* cmd4.c */
280-#ifndef JP
281-extern concptr get_ordinal_number_suffix(int num);
282-#endif
283-extern errr do_cmd_write_nikki(int type, int num, concptr note);
284-extern void do_cmd_nikki(void);
285-extern void do_cmd_redraw(void);
286-extern void do_cmd_change_name(void);
287-extern void do_cmd_message_one(void);
288-extern void do_cmd_messages(int num_now);
289-extern void do_cmd_options_aux(int page, concptr info);
290-extern void do_cmd_options(void);
291-extern void do_cmd_pref(void);
292-extern void do_cmd_reload_autopick(void);
293-extern void do_cmd_macros(void);
294-extern void do_cmd_visuals(void);
295-extern void do_cmd_colors(void);
296-extern void do_cmd_note(void);
297-extern void do_cmd_version(void);
298-extern void do_cmd_feeling(void);
299-extern void do_cmd_load_screen(void);
300-extern void do_cmd_save_screen_html_aux(char *filename, int message);
301-extern void do_cmd_save_screen(void);
302-extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]);
303-extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]);
304-extern void do_cmd_knowledge(void);
305-extern void plural_aux(char * Name);
306-extern void do_cmd_checkquest(void);
307-extern void do_cmd_time(void);
308-extern void do_cmd_suicide(void);
309279
310280 /* dungeon.c */
311281 extern void play_game(bool new_game);
--- a/src/files.c
+++ b/src/files.c
@@ -21,6 +21,7 @@
2121
2222 #include "bldg.h"
2323
24+#include "cmd-dump.h"
2425 #include "world.h"
2526 #include "player-race.h"
2627 #include "player-status.h"
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -14,6 +14,7 @@
1414 #include "player-effects.h"
1515 #include "objectkind.h"
1616 #include "object-ego.h"
17+#include "cmd-dump.h"
1718
1819 static bool mon_invis;
1920 static POSITION mon_fy, mon_fx;
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -100,6 +100,7 @@
100100 #include "util.h"
101101 #include "bldg.h"
102102
103+#include "cmd-dump.h"
103104 #include "grid.h"
104105 #include "rooms.h"
105106 #include "dungeon.h"
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -32,6 +32,7 @@
3232 #include "player-effects.h"
3333 #include "world.h"
3434 #include "spells.h"
35+#include "cmd-dump.h"
3536
3637 static FLOOR_IDX new_floor_id; /*!<次のフロアのID / floor_id of the destination */
3738 static u32b change_floor_mode; /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -100,6 +100,7 @@
100100 #include "angband.h"
101101 #include "util.h"
102102
103+#include "cmd-dump.h"
103104 #include "view-mainwindow.h"
104105 #include "floor.h"
105106 #include "floor-events.h"
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -16,6 +16,7 @@
1616 #include "angband.h"
1717 #include "util.h"
1818
19+#include "cmd-dump.h"
1920 #include "cmd-pet.h"
2021 #include "melee.h"
2122 #include "spells.h"
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1,6 +1,7 @@
11 #include "angband.h"
22 #include "util.h"
33
4+#include "cmd-dump.h"
45 #include "dungeon.h"
56 #include "floor.h"
67 #include "grid.h"
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -13,6 +13,7 @@
1313 #include "angband.h"
1414 #include "util.h"
1515
16+#include "cmd-dump.h"
1617 #include "bldg.h"
1718 #include "cmd-pet.h"
1819 #include "floor.h"
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -13,6 +13,7 @@
1313 #include "angband.h"
1414 #include "util.h"
1515
16+#include "cmd-dump.h"
1617 #include "cmd-pet.h"
1718 #include "dungeon.h"
1819 #include "floor.h"
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -14,6 +14,7 @@
1414 #include "angband.h"
1515 #include "util.h"
1616
17+#include "cmd-dump.h"
1718 #include "mutation.h"
1819
1920 #include "selfinfo.h"
--- a/src/object2.c
+++ b/src/object2.c
@@ -16,6 +16,7 @@
1616
1717 #include "object.h"
1818
19+#include "cmd-dump.h"
1920 #include "spells.h"
2021 #include "dungeon.h"
2122 #include "floor.h"
--- a/src/patron.c
+++ b/src/patron.c
@@ -2,6 +2,7 @@
22 #include "angband.h"
33 #include "util.h"
44
5+#include "cmd-dump.h"
56 #include "patron.h"
67 #include "cmd-pet.h"
78 #include "object-curse.h"
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -16,6 +16,7 @@
1616 #include "util.h"
1717
1818 #include "artifact.h"
19+#include "cmd-dump.h"
1920 #include "floor.h"
2021 #include "bldg.h"
2122 #include "birth.h"
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -29,6 +29,7 @@
2929 #include "objectkind.h"
3030 #include "monsterrace.h"
3131 #include "autopick.h"
32+#include "cmd-dump.h"
3233
3334 /*!
3435 * @var horror_desc
--- a/src/quest.c
+++ b/src/quest.c
@@ -12,6 +12,7 @@
1212 #include "artifact.h"
1313 #include "feature.h"
1414 #include "world.h"
15+#include "cmd-dump.h"
1516
1617 /*
1718 * Quest info
--- a/src/scores.c
+++ b/src/scores.c
@@ -22,6 +22,7 @@
2222 #include "scores.h"
2323 #include "floor.h"
2424 #include "world.h"
25+#include "cmd-dump.h"
2526
2627 /*!
2728 * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -15,6 +15,7 @@
1515 #include "util.h"
1616
1717 #include "cmd-pet.h"
18+#include "cmd-dump.h"
1819 #include "floor.h"
1920 #include "trap.h"
2021 #include "autopick.h"
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -16,6 +16,7 @@
1616
1717 #include "artifact.h"
1818 #include "cmd-pet.h"
19+#include "cmd-dump.h"
1920 #include "floor.h"
2021 #include "grid.h"
2122 #include "trap.h"
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -36,6 +36,7 @@
3636 #include "monster-status.h"
3737 #include "monster-spell.h"
3838 #include "cmd-spell.h"
39+#include "cmd-dump.h"
3940 #include "snipe.h"
4041 #include "floor-save.h"
4142 #include "files.h"
--- a/src/store.c
+++ b/src/store.c
@@ -14,6 +14,7 @@
1414 #include "util.h"
1515
1616 #include "floor.h"
17+#include "cmd-dump.h"
1718 #include "cmd-item.h"
1819 #include "cmd-smith.h"
1920 #include "cmd-zapwand.h"
--- a/src/trap.c
+++ b/src/trap.c
@@ -1,6 +1,7 @@
11 #include "angband.h"
22 #include "util.h"
33
4+#include "cmd-dump.h"
45 #include "trap.h"
56 #include "player-damage.h"
67 #include "player-move.h"
--- a/src/util.c
+++ b/src/util.c
@@ -17,6 +17,7 @@
1717 #include "quest.h"
1818 #include "floor.h"
1919 #include "world.h"
20+#include "cmd-dump.h"
2021
2122
2223 static int num_more = 0;
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -12,6 +12,7 @@
1212
1313 #include "angband.h"
1414 #include "dungeon.h"
15+#include "cmd-dump.h"
1516 #include "util.h"
1617 #include "birth.h"
1718 #include "selfinfo.h"
Show on old repository browser