[Scummvm-git-logs] scummvm master -> 5eea46f257450bb41a03ccdaf32cc3633fbab8c4

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5eea46f257 XEEN: Fix crash loading some savegames directly from launcher


Commit: 5eea46f257450bb41a03ccdaf32cc3633fbab8c4
    https://github.com/scummvm/scummvm/commit/5eea46f257450bb41a03ccdaf32cc3633fbab8c4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-06T18:13:43-07:00

Commit Message:
XEEN: Fix crash loading some savegames directly from launcher

Changed paths:
    NEWS.md
    engines/xeen/interface.cpp


diff --git a/NEWS.md b/NEWS.md
index 254ed301c6..691bae4229 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -37,6 +37,7 @@ For a more comprehensive changelog of the latest experimental code, see:
  Xeen:
    - Add missing sprite drawer for enemies hit by Energy Blast.
    - Fixed freeze due to bad mob data at the top of Witches Tower
+   - Fix crash loading some savegames directly from the launcher
 
  Linux port:
    - Added option to use the system file browser instead of the ScummVM file browser.
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 692dad7d97..69a574772e 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -187,12 +187,13 @@ void Interface::startup() {
 
 	animate3d();
 	if (_vm->_map->_isOutdoors) {
-		setIndoorsMonsters();
-		setIndoorsObjects();
-	} else {
 		setOutdoorsMonsters();
 		setOutdoorsObjects();
+	} else {
+		setIndoorsMonsters();
+		setIndoorsObjects();
 	}
+
 	draw3d(false);
 
 	if (g_vm->getGameID() == GType_Swords)