diff options
| author | Paul Gilbert | 2011-05-29 21:02:06 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-05-30 20:29:13 +1000 |
| commit | ed20f18d29fa6fcfa682c74530515e26a94aef29 (patch) | |
| tree | a7327a98b14fd03a414f4af1e31ce0f8d94c762a /engines/m4/mads_logic.cpp | |
| parent | 7f8a69d6fc44ca5515a91f29ce5451c12f85daa5 (diff) | |
| download | scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.tar.gz scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.tar.bz2 scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.zip | |
TSAGE: General cleanup of object class
Diffstat (limited to 'engines/m4/mads_logic.cpp')
| -rw-r--r-- | engines/m4/mads_logic.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/m4/mads_logic.cpp b/engines/m4/mads_logic.cpp index a73e943f4f..b1e57bd7f3 100644 --- a/engines/m4/mads_logic.cpp +++ b/engines/m4/mads_logic.cpp @@ -951,7 +951,7 @@ void MadsSceneLogic::callSubroutine(int subIndex, Common::Stack<ScriptVar> &stac // object_is_present EXTRACT_PARAMS(1); const MadsObject *obj = _madsVm->globals()->getObject(p[0]); - stack.push(ScriptVar((obj->roomNumber == _madsVm->scene()->_currentScene))); + stack.push(ScriptVar((obj->_roomNumber == _madsVm->scene()->_currentScene))); break; } @@ -978,6 +978,14 @@ void MadsSceneLogic::callSubroutine(int subIndex, Common::Stack<ScriptVar> &stac break; } + case 26: { + // object_set_room + EXTRACT_PARAMS(2); + MadsObject *obj = _madsVm->globals()->getObject(p[0]); + obj->setRoom(p[1]); + break; + } + default: error("Unknown subroutine %d called", subIndex); break; |