[Scummvm-git-logs] scummvm master -> 58fb6a4f8e065054ad9f2bcaaff4414e62d87a84

dreammaster dreammaster at scummvm.org
Sun Dec 17 03:47:48 CET 2017


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:
58fb6a4f8e XEEN: Fix loading correct sprites for map monsters


Commit: 58fb6a4f8e065054ad9f2bcaaff4414e62d87a84
    https://github.com/scummvm/scummvm/commit/58fb6a4f8e065054ad9f2bcaaff4414e62d87a84
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-12-16T21:47:38-05:00

Commit Message:
XEEN: Fix loading correct sprites for map monsters

Changed paths:
    engines/xeen/map.cpp


diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index b83083b..3417db8 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -1137,14 +1137,15 @@ void Map::load(int mapId) {
 
 	// Load sprites for the monsters
 	for (uint i = 0; i < _mobData._monsterSprites.size(); ++i) {
-		ArchiveType archiveType =
-			_mobData._monsterSprites[i]._spriteId == 91 && _vm->getGameID() == GType_WorldOfXeen ?
+		MonsterObjectData::SpriteResourceEntry &spr = _mobData._monsterSprites[i];
+		ArchiveType archiveType = spr._spriteId == 91 && _vm->getGameID() == GType_WorldOfXeen ?
 			ALTSIDE_ARCHIVE : GAME_ARCHIVE;
+		uint imgNumber = _monsterData[spr._spriteId]._imageNumber;
 
-		filename = Common::String::format("%03d.mon", _mobData._monsterSprites[i]._spriteId);
+		filename = Common::String::format("%03u.mon", imgNumber);
 		_mobData._monsterSprites[i]._sprites.load(filename, archiveType);
 
-		filename = Common::String::format("%03d.att", _mobData._monsterSprites[i]._spriteId);
+		filename = Common::String::format("%03u.att", imgNumber);
 		_mobData._monsterSprites[i]._attackSprites.load(filename, archiveType);
 	}
 





More information about the Scummvm-git-logs mailing list