diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-03-07 16:55:41 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-03-07 16:55:41 +0100 |
| commit | 752d3ce030b855544346f5f0424995cc11087bdb (patch) | |
| tree | 7cf364ebefac1684116f2e18124fe72aaaee5d52 | |
| parent | 5a1497b285b2aaad6c8945b9014c5ccd899af695 (diff) | |
Split loadsave.cc declarations to separate header files
| -rw-r--r-- | src/dungeon.cc | 2 | ||||
| -rw-r--r-- | src/externs.h | 7 | ||||
| -rw-r--r-- | src/files.cc | 2 | ||||
| -rw-r--r-- | src/generate.cc | 1 | ||||
| -rw-r--r-- | src/loadsave.cc | 3 | ||||
| -rw-r--r-- | src/loadsave.h | 16 | ||||
| -rw-r--r-- | src/loadsave.hpp | 7 | ||||
| -rw-r--r-- | src/main-sdl.c | 1 | ||||
| -rw-r--r-- | src/main-x11.c | 1 | ||||
| -rw-r--r-- | src/squeltch.cc | 1 |
10 files changed, 34 insertions, 7 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc index 12524b1b..66f535ad 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -28,6 +28,8 @@ #include "help.hpp" #include "hooks.h" #include "levels.hpp" +#include "loadsave.h" +#include "loadsave.hpp" #include "monster2.hpp" #include "monster3.hpp" #include "modules.hpp" diff --git a/src/externs.h b/src/externs.h index 75c7ca6e..b7ca83ff 100644 --- a/src/externs.h +++ b/src/externs.h @@ -501,13 +501,6 @@ extern s16b error_line; /* joke.c */ extern bool_ gen_joke_monsters(void *data, void *in, void *out); -/* loadsave.c */ -extern bool_ file_exist(cptr buf); -extern bool_ load_dungeon(char *ext); -extern void save_dungeon(void); -extern bool_ save_player(void); -extern bool_ load_player(void); - /* melee1.c */ /* melee2.c */ extern int monst_spell_monst_spell; diff --git a/src/files.cc b/src/files.cc index c15dbf6b..fce8a11c 100644 --- a/src/files.cc +++ b/src/files.cc @@ -16,6 +16,8 @@ #include "hiscore.h" #include "hooks.h" #include "levels.hpp" +#include "loadsave.h" +#include "loadsave.hpp" #include "mimic.hpp" #include "monster2.hpp" #include "monster3.hpp" diff --git a/src/generate.cc b/src/generate.cc index b244b528..3dc67667 100644 --- a/src/generate.cc +++ b/src/generate.cc @@ -10,6 +10,7 @@ #include "cave.hpp" #include "hooks.h" #include "levels.hpp" +#include "loadsave.hpp" #include "monster2.hpp" #include "randart.hpp" #include "spells1.hpp" diff --git a/src/loadsave.cc b/src/loadsave.cc index 3f02bd1f..1cb83062 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -1,3 +1,6 @@ +#include "loadsave.hpp" +#include "loadsave.h" + #include "angband.h" #include "birth.hpp" #include "levels.hpp" diff --git a/src/loadsave.h b/src/loadsave.h new file mode 100644 index 00000000..61bfced7 --- /dev/null +++ b/src/loadsave.h @@ -0,0 +1,16 @@ +#pragma once + +#include "h-basic.h" + +// C linkage required for these functions since main-* code uses them. +#ifdef __cplusplus +extern "C" { +#endif + +/* loadsave.c */ +extern void save_dungeon(void); +extern bool_ save_player(void); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/src/loadsave.hpp b/src/loadsave.hpp new file mode 100644 index 00000000..a9eb9dc8 --- /dev/null +++ b/src/loadsave.hpp @@ -0,0 +1,7 @@ +#pragma once + +#include "h-basic.h" + +extern bool_ file_exist(cptr buf); +extern bool_ load_dungeon(char *ext); +extern bool_ load_player(void); diff --git a/src/main-sdl.c b/src/main-sdl.c index 03023b86..736202f3 100644 --- a/src/main-sdl.c +++ b/src/main-sdl.c @@ -26,6 +26,7 @@ #ifdef USE_SDL #include "angband.h" +#include "loadsave.h" #include "util.h" #include <SDL.h> diff --git a/src/main-x11.c b/src/main-x11.c index cb5eaa10..c19b8d99 100644 --- a/src/main-x11.c +++ b/src/main-x11.c @@ -93,6 +93,7 @@ */ #include "angband.h" +#include "loadsave.h" #include "util.h" #ifdef USE_X11 diff --git a/src/squeltch.cc b/src/squeltch.cc index 100a4d8d..8d07d0d5 100644 --- a/src/squeltch.cc +++ b/src/squeltch.cc @@ -10,6 +10,7 @@ #include "squeltch.hpp" #include "files.hpp" +#include "loadsave.hpp" #include "tome/squelch/tree_printer.hpp" #include "tome/squelch/condition.hpp" #include "tome/squelch/condition_metadata.hpp" |