libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Fix regression in locals init for re-used segments

Browse Source 
svn-id: r48783
This commit is contained in:
Walter van Niftrik 2010-04-24 14:10:52 +00:00
parent ca93a6ce9c
commit b6c92b90b6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/sci/engine/script.cpp
View File

@ -167,7 +167,11 @@ void SegManager::scriptInitialiseLocalsZero(SegmentId seg, int count) {
scr->_localsOffset = -count * 2; // Make sure it's invalid
allocLocalsSegment(scr, count);
LocalVariables *locals = allocLocalsSegment(scr, count);
if (locals) {
for (int i = 0; i < count; i++)
locals->_locals[i] = NULL_REG;
}
}
void SegManager::scriptInitialiseLocals(reg_t location) {
@ -195,7 +199,7 @@ void SegManager::scriptInitialiseLocals(reg_t location) {
byte *base = (byte *)(scr->_buf + location.offset);
for (i = 0; i < count; i++)
locals->_locals[i].offset = READ_LE_UINT16(base + i * 2);
locals->_locals[i] = make_reg(0, READ_LE_UINT16(base + i * 2));
}
}