summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-pick-data.h
diff options
context:
space:
mode:
authorreaverb <reaverb.Crawl@gmail.com>2014-06-21 14:36:54 -0400
committerreaverb <reaverb.Crawl@gmail.com>2014-06-21 14:41:49 -0400
commit93daa8595e1fafc5c37f630683154975be97dadb (patch)
tree57f02b2c3f786751025daf9ef4285777a0edeb74 /crawl-ref/source/mon-pick-data.h
parent25bcbd27cf7670b42741cb68ac8dfa3c48cf9ae5 (diff)
downloadcrawl-ref-93daa8595e1fafc5c37f630683154975be97dadb.tar.gz
crawl-ref-93daa8595e1fafc5c37f630683154975be97dadb.zip
Remove some Forest spawn tables on TAG_MAJOR_VERSION bump
The only reason I'm not removing the main one now is that it still might be used for Crypt zombies.
Diffstat (limited to 'crawl-ref/source/mon-pick-data.h')
-rw-r--r--crawl-ref/source/mon-pick-data.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index 8a333dd844..a00f7aa111 100644
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -730,7 +730,7 @@ static const pop_entry pop_zot[] =
{ 1, 11, 367, SEMI, MONS_GOLDEN_DRAGON },
{ 0,0,0,FLAT,MONS_0 }
};
-
+#if TAG_MAJOR_VERSION == 34
static const pop_entry pop_forest[] =
{ // Forest
{ 1, 5, 120, DOWN, MONS_WOLF },
@@ -758,6 +758,7 @@ static const pop_entry pop_forest[] =
{ 1, 5, 125, FLAT, MONS_BUTTERFLY },
{ 0,0,0,FLAT,MONS_0 }
};
+#endif
static const pop_entry pop_abyss[] =
{ // Abyss
@@ -1317,14 +1318,6 @@ static const pop_entry pop_water_snake[] =
{ 0,0,0,FLAT,MONS_0 }
};
-static const pop_entry pop_water_forest[] =
-{ // Forest water monsters
- { 1, 5, 35, FLAT, MONS_BIG_FISH },
- { 1, 5, 125, FLAT, MONS_WATER_ELEMENTAL },
- { 1, 9, 120, SEMI, MONS_WATER_NYMPH },
- { 0,0,0,FLAT,MONS_0 }
-};
-
static const pop_entry pop_water_hell[] =
{ // Hell branch water monsters
{ 1, 7, 150, FLAT, MONS_SPINY_FROG },
@@ -1367,7 +1360,7 @@ static const struct { const pop_entry *pop; int count; } population_water[] =
POP(water_hell),
POP(water_generic),
#if TAG_MAJOR_VERSION == 34
- POP(water_forest),
+ POP(water_generic), // Forest
#endif
POP(water_generic),
POP(water_generic),