summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:40 +0100
committerBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:40 +0100
commitbcd70db7575040969a4fd5c5b9522f1ab87ab220 (patch)
tree9b6bee4ab662c0899019745f6dd4406f9de5f976 /src
parentb07243bd2d8c8d9f6521048ceddf3a95e029decc (diff)
Split wild.cc declarations to separate header file
Diffstat (limited to 'src')
-rw-r--r--src/cmd1.cc1
-rw-r--r--src/cmd6.cc1
-rw-r--r--src/dungeon.cc1
-rw-r--r--src/externs.h7
-rw-r--r--src/generate.cc1
-rw-r--r--src/wild.cc4
-rw-r--r--src/wild.hpp6
7 files changed, 13 insertions, 8 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc
index 0b0c91ad..7e3cb40c 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -25,6 +25,7 @@
#include "traps.hpp"
#include "util.hpp"
#include "util.h"
+#include "wild.hpp"
#include "xtra1.hpp"
#include "xtra2.hpp"
diff --git a/src/cmd6.cc b/src/cmd6.cc
index eb4c6d25..b70bdc11 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -25,6 +25,7 @@
#include "spells5.hpp"
#include "store.hpp"
#include "util.hpp"
+#include "wild.hpp"
#include "wizard2.hpp"
#include "xtra1.hpp"
#include "xtra2.hpp"
diff --git a/src/dungeon.cc b/src/dungeon.cc
index fdc773a7..9bf13747 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -39,6 +39,7 @@
#include "store.hpp"
#include "util.hpp"
#include "util.h"
+#include "wild.hpp"
#include "xtra1.hpp"
#include "xtra2.hpp"
diff --git a/src/externs.h b/src/externs.h
index 82a69da3..1df9e301 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -494,13 +494,6 @@ extern void race_legends(void);
extern void show_highclass(int building);
extern errr get_xtra_line(const char * file_name, monster_type *m_ptr, char * output);
-/* wild.c */
-extern int generate_area(int y, int x, bool_ border, bool_ corner, bool_ refresh);
-extern void wilderness_gen(int refresh);
-extern void wilderness_gen_small(void);
-extern void reveal_wilderness_around_player(int y, int x, int h, int w);
-extern void town_gen(int t_idx);
-
/* init1.c */
extern int color_char_to_attr(char c);
diff --git a/src/generate.cc b/src/generate.cc
index a0fe829b..46a2dfba 100644
--- a/src/generate.cc
+++ b/src/generate.cc
@@ -15,6 +15,7 @@
#include "spells1.hpp"
#include "traps.hpp"
#include "util.hpp"
+#include "wild.hpp"
#include <cassert>
#include <memory>
diff --git a/src/wild.cc b/src/wild.cc
index 3aaf2894..c474f692 100644
--- a/src/wild.cc
+++ b/src/wild.cc
@@ -6,6 +6,8 @@
* included in all such copies.
*/
+#include "wild.hpp"
+
#include "angband.h"
#include "cave.hpp"
#include "hooks.h"
@@ -134,7 +136,7 @@ static void plasma_recursive(int x1, int y1, int x2, int y2,
*
* Return the number of floor grids
*/
-int generate_area(int y, int x, bool_ border, bool_ corner, bool_ refresh)
+static int generate_area(int y, int x, bool_ border, bool_ corner, bool_ refresh)
{
int road, entrance;
int x1, y1;
diff --git a/src/wild.hpp b/src/wild.hpp
new file mode 100644
index 00000000..ea137f83
--- /dev/null
+++ b/src/wild.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+extern void wilderness_gen(int refresh);
+extern void wilderness_gen_small(void);
+extern void reveal_wilderness_around_player(int y, int x, int h, int w);
+extern void town_gen(int t_idx);