From def21e40a42a6e7dc949e9748de61f6bc0561216 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 27 Jun 2012 21:57:37 +0200 Subject: Remove MONSTER_HORDES preprocessor define --- src/config.h | 5 ----- src/monster2.c | 8 -------- src/wizard2.c | 6 ------ 3 files changed, 19 deletions(-) (limited to 'src') diff --git a/src/config.h b/src/config.h index 87e7e89a..1a7218d7 100644 --- a/src/config.h +++ b/src/config.h @@ -226,11 +226,6 @@ -/* ToME options: */ - -/* Allow hordes of 'similar' monsters */ -#define MONSTER_HORDES - /* Wizard mode testing options: */ /* For testing the vaults */ diff --git a/src/monster2.c b/src/monster2.c index e9ae164e..b87df278 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -2940,8 +2940,6 @@ bool_ place_monster(int y, int x, bool_ slp, bool_ grp) } -#ifdef MONSTER_HORDES - bool_ alloc_horde(int y, int x) { int r_idx = 0; @@ -2999,8 +2997,6 @@ bool_ alloc_horde(int y, int x) return TRUE; } -#endif /* MONSTER_HORDES */ - /* * Attempt to allocate a random monster in the dungeon. * @@ -3040,7 +3036,6 @@ bool_ alloc_monster(int dis, bool_ slp) } -#ifdef MONSTER_HORDES if (randint(5000) <= dun_level) { if (alloc_horde(y, x)) @@ -3051,14 +3046,11 @@ bool_ alloc_monster(int dis, bool_ slp) } else { -#endif /* MONSTER_HORDES */ /* Attempt to place the monster, allow groups */ if (place_monster(y, x, slp, TRUE)) return (TRUE); -#ifdef MONSTER_HORDES } -#endif /* MONSTER_HORDES */ /* Nope */ return (FALSE); diff --git a/src/wizard2.c b/src/wizard2.c index f6ce41af..2a372bcd 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -184,8 +184,6 @@ static void wiz_create_named_art() msg_print("Allocated."); } -#ifdef MONSTER_HORDES - /* Summon a horde of monsters */ static void do_cmd_summon_horde() { @@ -201,8 +199,6 @@ static void do_cmd_summon_horde() (void)alloc_horde(wy, wx); } -#endif /* MONSTER_HORDES */ - /* * Output a long int in binary format. @@ -1706,10 +1702,8 @@ void do_cmd_debug(void) case 'h': do_cmd_rerate(); break; -#ifdef MONSTER_HORDES case 'H': do_cmd_summon_horde(); break; -#endif /* MONSTER_HORDES */ /* Identify */ case 'i': -- cgit v1.2.3