From 673859ea2ec2512b37ce1c74a0ea9c0412f43282 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 7 Jul 2008 12:38:16 +0000 Subject: Fix 2012088: Monsters "following" you from the Abyss to the wrong level. A few fixes to starting equipment and skills. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6440 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/files.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/files.cc') diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index dc9b4e8149..c906a36123 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -931,16 +931,20 @@ static bool _grab_follower_at(const coord_def &pos) if (!fmenv || !fmenv->alive()) return (false); - // monster has to be already tagged in order to follow: + // Monster has to be already tagged in order to follow. if (!testbits( fmenv->flags, MF_TAKING_STAIRS )) return (false); + level_id dest = level_id::current(); + if (you.char_direction == GDT_GAME_START) + dest.depth = 1; + #if DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "%s is following to %s.", fmenv->name(DESC_CAP_THE, true).c_str(), - level_id::current().describe().c_str()); + dest.describe().c_str()); #endif - fmenv->set_transit(level_id::current()); + fmenv->set_transit(dest); fmenv->destroy_inventory(); monster_cleanup(fmenv); return (true); @@ -1727,7 +1731,7 @@ static bool _get_and_validate_version(FILE *restoreFile, char &major, char &mino return (false); } - if (minor > TAG_MINOR_VERSION) + if (minor > TAG_MINOR_VERSION) { *reason = make_stringf("Minor version mismatch: %d (want <= %d).", minor, TAG_MINOR_VERSION); -- cgit v1.2.3-54-g00ecf