[Scummvm-git-logs] scummvm master -> 35833695c0c9dd0b41e8d60efd26d5a49f754ad5

[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:
35833695c0 XEEN: Fix hooking up monster data during map loading


Commit: 35833695c0c9dd0b41e8d60efd26d5a49f754ad5
    https://github.com/scummvm/scummvm/commit/35833695c0c9dd0b41e8d60efd26d5a49f754ad5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-24T21:31:10-05:00

Commit Message:
XEEN: Fix hooking up monster data during map loading

Changed paths:
    engines/xeen/map.cpp


diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index ec58a0f..f5c66ed 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -817,13 +817,13 @@ void MonsterObjectData::synchronize(XeenSerializer &s, MonsterData &monsterData)
 			MazeMonster mon;
 			mon._position = mobStruct._pos;
 			mon._id = mobStruct._id;
-			mon._monsterData = &monsterData[mon._spriteId];
 			mon._frame = _vm->getRandomNumber(7);
 
 			if (mon._id < (int)_monsterSprites.size()) {
 				mon._spriteId = _monsterSprites[mon._id]._spriteId;
 				mon._sprites = &_monsterSprites[mon._id]._sprites;
 				mon._attackSprites = &_monsterSprites[mon._id]._attackSprites;
+				mon._monsterData = &monsterData[mon._spriteId];
 			} else {
 				assert(!mon._id);
 			}