summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:15 +0200
committerBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:15 +0200
commit8bf363159104aa0c87d8021e731022c41df8037f (patch)
treed3a51f6b33279c3427d0032c055ddaa5afc800c4 /src
parent05cdb1a997cba7748f0089cffa0a5885ca0b2c43 (diff)
Remove init_wilderness()
Diffstat (limited to 'src')
-rw-r--r--src/init2.cc15
-rw-r--r--src/variable.cc2
2 files changed, 1 insertions, 16 deletions
diff --git a/src/init2.cc b/src/init2.cc
index 57f3255c..9d2a9d84 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -720,17 +720,6 @@ void create_stores_stock(int t)
}
/*
- * Initialise wilderness map array
- */
-static errr init_wilderness(void)
-{
- /* No encounter right now */
- generate_encounter = FALSE;
-
- return 0;
-}
-
-/*
* Initialise some other arrays
*/
static errr init_other(void)
@@ -1348,10 +1337,6 @@ void init_angband(void)
note("[Initialising arrays... (wilderness features)]");
if (init_x_info<wf_info_traits>()) quit("Cannot initialise wilderness features");
- /* Initialise wilderness map array */
- note("[Initialising arrays... (wilderness map)]");
- if (init_wilderness()) quit("Cannot initialise wilderness map");
-
/* Initialise town array */
note("[Initialising arrays... (towns)]");
if (init_towns()) quit("Cannot initialise towns");
diff --git a/src/variable.cc b/src/variable.cc
index 91cb2a08..553c1dd2 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -832,7 +832,7 @@ s16b *max_dlv;
s16b doppleganger;
/* To allow wilderness encounters */
-bool_ generate_encounter;
+bool_ generate_encounter = FALSE;
/*
* Such an ugly hack ...