libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 12:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: fix o_setObjectName()

Browse Source 
The parameter can either be a FG or BG object depending on the opcode.
This commit is contained in:
Tobias Gunkel 2012-01-22 23:06:07 +01:00
parent b31157cee3
commit b0201a8df2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/scumm/script_v0.cpp
View File

@ -756,9 +756,16 @@ void ScummEngine_v0::o_pickupObject() {
} }
void ScummEngine_v0::o_setObjectName() { void ScummEngine_v0::o_setObjectName() {
int obj = fetchScriptByte(); int obj;
if (!obj) int objId = fetchScriptByte();
if (!objId) {
obj = _cmdObject; obj = _cmdObject;
} else {
if (_opcode & 0x80)
obj = OBJECT_V0(objId, kObjectV0TypeBG);
else
obj = OBJECT_V0(objId, kObjectV0TypeFG);
}
setObjectName(obj); setObjectName(obj);
} }