diff options
| -rw-r--r-- | lib/help/debug.txt | 3 | ||||
| -rw-r--r-- | lib/mods/theme/help/debug.txt | 3 | ||||
| -rw-r--r-- | src/config.h | 5 | ||||
| -rw-r--r-- | src/monster2.c | 8 | ||||
| -rw-r--r-- | src/wizard2.c | 6 |
5 files changed, 2 insertions, 23 deletions
diff --git a/lib/help/debug.txt b/lib/help/debug.txt index 4d5e75da..0420a42c 100644 --- a/lib/help/debug.txt +++ b/lib/help/debug.txt @@ -138,8 +138,7 @@ maximal legal value. Change your life rating. ~~~~~16 [[[[[GHostile monster creation (H)] - Summons a Pack of Creatures of the same kind. Will only work - if MONSTER_HORDES has been defined at compile time. + Summons a Pack of Creatures of the same kind. ~~~~~17 [[[[[GIdentify (i)] Like a Scroll of Identify. diff --git a/lib/mods/theme/help/debug.txt b/lib/mods/theme/help/debug.txt index 56d57098..780b2f4d 100644 --- a/lib/mods/theme/help/debug.txt +++ b/lib/mods/theme/help/debug.txt @@ -138,8 +138,7 @@ maximal legal value. Change your life rating. ~~~~~16 [[[[[GHostile monster creation (H)] - Summons a Pack of Creatures of the same kind. Will only work - if MONSTER_HORDES has been defined at compile time. + Summons a Pack of Creatures of the same kind. ~~~~~17 [[[[[GIdentify (i)] Like a Scroll of Identify. 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': |