diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 17:47:17 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 17:47:17 +0000 |
| commit | d4828ced1edd21e0fc259c354c7bc45766e5f35d (patch) | |
| tree | f22e6a76f496cfe789f30df5c585d070fb057fcc | |
| parent | 4801b64ec8a108d6728780f64118e557fcfd7185 (diff) | |
| download | crawl-ref-d4828ced1edd21e0fc259c354c7bc45766e5f35d.tar.gz crawl-ref-d4828ced1edd21e0fc259c354c7bc45766e5f35d.zip | |
Re-enable ghosts in Labyrinths.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2381 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/direct.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/files.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index 4cc6f30c57..a36b6ffe45 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1874,7 +1874,8 @@ static void describe_monster(const monsters *mon) } if (mon->attitude == ATT_FRIENDLY) - mprf(MSGCH_EXAMINE, "%s is friendly.", mons_pronoun(mon->type, PRONOUN_CAP)); + mprf(MSGCH_EXAMINE, "%s is friendly.", + mons_pronoun(mon->type, PRONOUN_CAP)); else if (mon->attitude == ATT_NEUTRAL) mprf(MSGCH_EXAMINE, "%s is indifferent to you.", mons_pronoun(mon->type, PRONOUN_CAP)); diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 1c1af9c8d0..b7d7ff2b67 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -908,10 +908,9 @@ bool load( dungeon_feature_type stair_taken, int load_mode, just_created_level = true; if ((you.your_level > 1 || you.level_type != LEVEL_DUNGEON) - && one_chance_in(3) - && you.level_type != LEVEL_LABYRINTH) + && one_chance_in(3)) { - load_ghost(); // no ghosts in Labyrinth + load_ghost(); } env.turns_on_level = 0; } diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 396d2811e1..f8ec245d87 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2306,7 +2306,7 @@ bool monster_senior(const monsters *m1, const monsters *m2) monsters::monsters() : type(-1), hit_points(0), max_hit_points(0), hit_dice(0), ac(0), ev(0), speed(0), speed_increment(0), x(0), y(0), - target_x(0), target_y(0), inv(), spells(), attitude(ATT_NEUTRAL), + target_x(0), target_y(0), inv(), spells(), attitude(ATT_HOSTILE), behaviour(BEH_WANDER), foe(MHITYOU), enchantments(), flags(0L), number(0), colour(BLACK), foe_memory(0), god(GOD_NO_GOD), ghost() |