summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd2.cc2
-rw-r--r--src/cmd2.hpp32
-rw-r--r--src/dungeon.cc1
-rw-r--r--src/externs.h31
-rw-r--r--src/monster3.cc1
-rw-r--r--src/object1.cc1
-rw-r--r--src/powers.cc1
-rw-r--r--src/skills.cc1
-rw-r--r--src/traps.cc1
9 files changed, 40 insertions, 31 deletions
diff --git a/src/cmd2.cc b/src/cmd2.cc
index e9cdd333..5b70a186 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -6,6 +6,8 @@
* included in all such copies.
*/
+#include "cmd2.hpp"
+
#include "angband.h"
#include "bldg.hpp"
#include "cave.hpp"
diff --git a/src/cmd2.hpp b/src/cmd2.hpp
new file mode 100644
index 00000000..0179ed1d
--- /dev/null
+++ b/src/cmd2.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "angband.h"
+
+extern byte show_monster_inven(int m_idx, int *monst_list);
+extern int breakage_chance(object_type *o_ptr);
+extern void do_cmd_go_up(void);
+extern void do_cmd_go_down(void);
+extern void do_cmd_search(void);
+extern void do_cmd_toggle_search(void);
+extern void do_cmd_open(void);
+extern void do_cmd_close(void);
+extern void do_cmd_chat(void);
+extern void do_cmd_give(void);
+extern void do_cmd_tunnel(void);
+extern void do_cmd_disarm(void);
+extern void do_cmd_bash(void);
+extern void do_cmd_alter(void);
+extern void do_cmd_spike(void);
+extern void do_cmd_walk(int pickup, bool_ disarm);
+extern void do_cmd_stay(int pickup);
+extern void do_cmd_run(void);
+extern void do_cmd_rest(void);
+extern int get_shooter_mult(object_type *o_ptr);
+extern void do_cmd_fire(void);
+extern void do_cmd_throw(void);
+extern void do_cmd_boomerang(void);
+extern void do_cmd_immovable_special(void);
+extern void fetch(int dir, int wgt, bool_ require_los);
+extern void do_cmd_sacrifice(void);
+extern void do_cmd_create_artifact(object_type *q_ptr);
+extern void do_cmd_steal(void);
diff --git a/src/dungeon.cc b/src/dungeon.cc
index cfe84cbc..8bd1fe77 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -10,6 +10,7 @@
#include "birth.hpp"
#include "cave.hpp"
#include "cmd1.hpp"
+#include "cmd2.hpp"
#include "corrupt.hpp"
#include "gods.hpp"
#include "help.hpp"
diff --git a/src/externs.h b/src/externs.h
index 1b05cad0..5f0c8b0f 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -462,37 +462,6 @@ extern const char *get_version_string();
/* birth.c */
extern bool_ no_begin_screen;
-/* cmd2.c */
-extern byte show_monster_inven(int m_idx, int *monst_list);
-extern int breakage_chance(object_type *o_ptr);
-extern void do_cmd_go_up(void);
-extern void do_cmd_go_down(void);
-extern void do_cmd_search(void);
-extern void do_cmd_toggle_search(void);
-extern void do_cmd_open(void);
-extern void do_cmd_close(void);
-extern void do_cmd_chat(void);
-extern void do_cmd_give(void);
-extern void do_cmd_tunnel(void);
-extern void do_cmd_disarm(void);
-extern void do_cmd_bash(void);
-extern void do_cmd_alter(void);
-extern void do_cmd_spike(void);
-extern void do_cmd_walk(int pickup, bool_ disarm);
-extern void do_cmd_stay(int pickup);
-extern void do_cmd_run(void);
-extern void do_cmd_rest(void);
-extern int get_shooter_mult(object_type *o_ptr);
-extern void do_cmd_fire(void);
-extern void do_cmd_throw(void);
-extern void do_cmd_boomerang(void);
-extern void do_cmd_immovable_special(void);
-extern void fetch(int dir, int wgt, bool_ require_los);
-extern void do_cmd_sacrifice(void);
-extern void do_cmd_create_artifact(object_type *q_ptr);
-extern void do_cmd_steal(void);
-extern void do_cmd_racial_power(void);
-
/* cmd3.c */
extern void do_cmd_html_dump(void);
extern void cli_add(cptr active, cptr trigger, cptr descr);
diff --git a/src/monster3.cc b/src/monster3.cc
index e8ff9841..9e7df503 100644
--- a/src/monster3.cc
+++ b/src/monster3.cc
@@ -7,6 +7,7 @@
*/
#include "angband.h"
+#include "cmd2.hpp"
#include "gods.hpp"
#include "skills.hpp"
#include "xtra2.hpp"
diff --git a/src/object1.cc b/src/object1.cc
index 492cd9dd..dc80962a 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -8,6 +8,7 @@
#include "angband.h"
#include "cave.hpp"
+#include "cmd2.hpp"
#include "hooks.h"
#include "lua_bind.hpp"
#include "mimic.hpp"
diff --git a/src/powers.cc b/src/powers.cc
index b20491fe..0af9a761 100644
--- a/src/powers.cc
+++ b/src/powers.cc
@@ -9,6 +9,7 @@
#include "angband.h"
#include "cave.hpp"
#include "cmd1.hpp"
+#include "cmd2.hpp"
#include "quark.h"
#include "hooks.h"
#include "mimic.hpp"
diff --git a/src/skills.cc b/src/skills.cc
index 2dbcb6ca..700405b8 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -8,6 +8,7 @@
#include "angband.h"
#include "birth.hpp"
+#include "cmd2.hpp"
#include "gods.hpp"
#include "help.hpp"
#include "hooks.h"
diff --git a/src/traps.cc b/src/traps.cc
index 533467f5..26e5f3bc 100644
--- a/src/traps.cc
+++ b/src/traps.cc
@@ -10,6 +10,7 @@
#include "angband.h"
#include "cave.hpp"
#include "cmd1.hpp"
+#include "cmd2.hpp"
#include "gods.hpp"
#include "xtra1.hpp"
#include "xtra2.hpp"