libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 18:06:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

XEEN: Fix crash getting Scarab of Imaging

Browse Source
This commit is contained in:
Paul Gilbert 2018-04-06 21:05:40 -04:00
parent 4586cee0ab
commit 9d94d97cc6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/xeen/scripts.cpp
View File

@ -214,7 +214,7 @@ int Scripts::checkEvents() {
MazeObject &selectedObj = map._mobData._objects[intf._objNumber]; MazeObject &selectedObj = map._mobData._objects[intf._objNumber];
if (selectedObj._spriteId == (ccNum ? 15 : 16)) { if (selectedObj._spriteId == (ccNum ? 15 : 16)) {
for (uint idx = 0; idx < 16; ++idx) { for (uint idx = 0; idx < MIN((int)map._mobData._objects.size(), 16); ++idx) {
MazeObject &obj = map._mobData._objects[idx]; MazeObject &obj = map._mobData._objects[idx];
if (obj._spriteId == (ccNum ? 62 : 57)) { if (obj._spriteId == (ccNum ? 62 : 57)) {
selectedObj._id = idx; selectedObj._id = idx;
@ -223,7 +223,7 @@ int Scripts::checkEvents() {
} }
} }
} else if (selectedObj._spriteId == 73) { } else if (selectedObj._spriteId == 73) {
for (uint idx = 0; idx < 16; ++idx) { for (uint idx = 0; idx < MIN((int)map._mobData._objects.size(), 16); ++idx) {
MazeObject &obj = map._mobData._objects[idx]; MazeObject &obj = map._mobData._objects[idx];
if (obj._spriteId == 119) { if (obj._spriteId == 119) {
selectedObj._id = idx; selectedObj._id = idx;