summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/files.cc2
-rw-r--r--crawl-ref/source/religion.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index b1704bc9e9..f950698192 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -1056,7 +1056,7 @@ bool load( dungeon_feature_type stair_taken, load_mode_type load_mode,
false );
if (you.level_type == LEVEL_DUNGEON && old_level_type == LEVEL_DUNGEON
- || load_mode == LOAD_START_GAME)
+ || load_mode == LOAD_START_GAME && you.char_direction != GDT_GAME_START)
{
if (tmp_file_pairs[you.your_level][you.where_are_you] == false)
{
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 1966e9b047..303e26716e 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -5509,7 +5509,7 @@ void god_pitch(god_type which_god)
mpr("Your evil allies forsake you.", MSGCH_MONSTER_ENCHANT);
if (you.religion == GOD_ZIN && _chaotic_beings_attitude_change())
mpr("Your chaotic allies forsake you.", MSGCH_MONSTER_ENCHANT);
- if (you.religion == GOD_TROG && _magic_users_attitude_change())
+ else if (you.religion == GOD_TROG && _magic_users_attitude_change())
mpr("Your magic-using allies forsake you.", MSGCH_MONSTER_ENCHANT);
if (you.religion == GOD_ELYVILON)