summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2013-03-27 06:32:45 +0100
committerBardur Arantsson <bardur@scientician.net>2013-09-27 14:46:42 +0200
commit3ceb6ba12f66db6df2e1b73e02de33a8950564de (patch)
treebfb020a9f75ab4f412cc835ba2b63e55cf1456ed /src
parent9519fbdcfe2b2aad12c95e006a94403c1817355a (diff)
Move extern declarations in wizard*.c to externs.h
Diffstat (limited to 'src')
-rw-r--r--src/dungeon.c6
-rw-r--r--src/externs.h7
-rw-r--r--src/status.c3
-rw-r--r--src/wizard1.c8
-rw-r--r--src/wizard2.c19
5 files changed, 10 insertions, 33 deletions
diff --git a/src/dungeon.c b/src/dungeon.c
index 5f3d9ab6..5eb38c51 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -3435,12 +3435,6 @@ static bool_ enter_debug_mode(void)
/*
- * Hack -- Declare the Debug Routines
- */
-extern void do_cmd_debug(void);
-
-
-/*
* Parse and execute the current command
* Give "Warning" on illegal commands.
*
diff --git a/src/externs.h b/src/externs.h
index ee6359fd..ce388136 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -2173,9 +2173,13 @@ extern int get_fbranch(void);
extern int get_flevel(void);
extern bool_ get_dungeon_save(char *buf);
+/* wizard1.c */
+extern void do_cmd_spoilers();
+
/* wizard2.c */
extern void do_cmd_wiz_cure_all(void);
extern void do_cmd_wiz_named_friendly(int r_idx, bool_ slp);
+extern void do_cmd_debug();
extern tval_desc2 tvals[];
/* notes.c */
@@ -2263,6 +2267,9 @@ extern bool_ easy_floor;
/* script.c */
extern void init_lua_init(void);
+/* status.c */
+extern void status_main();
+
/* modules.c */
extern void module_reset_dir(cptr dir, cptr new_path);
extern cptr force_module;
diff --git a/src/status.c b/src/status.c
index 967a8323..c6306693 100644
--- a/src/status.c
+++ b/src/status.c
@@ -34,7 +34,6 @@ static void status_companion(void);
void status_sight(void);
void status_attr(void);
void status_combat(void);
-void status_main(void);
void status_move(void);
void status_item(void);
void az_line(int, u32b[INVEN_TOTAL - INVEN_WIELD + 2][7]);
@@ -373,7 +372,7 @@ void status_res(void)
}
}
-void status_main(void)
+void status_main()
{
int do_quit = 0;
char c;
diff --git a/src/wizard1.c b/src/wizard1.c
index 7daef324..ab7635d7 100644
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -2652,16 +2652,10 @@ static void spoil_spells(cptr fname)
}
-
-/*
- * Forward declare
- */
-extern void do_cmd_spoilers(void);
-
/*
* Create Spoiler files -BEN-
*/
-void do_cmd_spoilers(void)
+void do_cmd_spoilers()
{
int i;
diff --git a/src/wizard2.c b/src/wizard2.c
index eb391437..a843b7c9 100644
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -13,9 +13,6 @@
#include "angband.h"
#include "hooks.h"
-void do_cmd_wizard_body(s16b);
-extern void status_main(void);
-
/*
* Adds a lvl to a monster
*/
@@ -1579,24 +1576,10 @@ extern void do_cmd_wiz_body(s16b bidx)
/*
- * External function
- */
-extern void do_cmd_spoilers(void);
-
-
-
-/*
- * Hack -- declare external function
- */
-extern void do_cmd_debug(void);
-
-
-
-/*
* Ask for and parse a "debug command"
* The "command_arg" may have been set.
*/
-void do_cmd_debug(void)
+void do_cmd_debug()
{
int x, y;
char cmd;