[Scummvm-git-logs] scummvm branch-2-1 -> 430b872647db72673ce174fd38cdacb3a8e46a1a

dreammaster paulfgilbert at gmail.com
Sat Jan 11 18:39:47 UTC 2020


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:
430b872647 XEEN: Mine Alpha fix needed to apply to non-CD version as well


Commit: 430b872647db72673ce174fd38cdacb3a8e46a1a
    https://github.com/scummvm/scummvm/commit/430b872647db72673ce174fd38cdacb3a8e46a1a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-01-11T10:38:57-08:00

Commit Message:
XEEN: Mine Alpha fix needed to apply to non-CD version as well

Changed paths:
    engines/xeen/map.cpp


diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 22a8536..9e6c7c1 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -786,9 +786,9 @@ void Map::load(int mapId) {
 			} else if (File::exists(mobName)) {
 				// For surrounding maps, set up flags for whether objects are present
 
-				// WORKAROUND: In WOX CD Map 120, one of the maps for Deep Mine Alpha,
+				// WORKAROUND: In WOX Map 120, one of the maps for Deep Mine Alpha,
 				// has invalid monster data. So to work around it, we just ignore it
-				if (!(mapId == 120 && g_vm->getIsCD() && g_vm->getGameID() == GType_WorldOfXeen)) {
+				if (!(mapId == 120 && g_vm->getGameID() == GType_WorldOfXeen)) {
 					// Load the monster/object data
 					File mobFile(mobName);
 					XeenSerializer sMob(&mobFile, nullptr);




More information about the Scummvm-git-logs mailing list