thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source 
svn-id: r6140
This commit is contained in:
Max Horn 2002-12-25 19:06:31 +00:00
parent 7c7af18bc9
commit 447ab20369
4 changed files with 54 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scumm/script.cpp
View file

@ -131,9 +131,8 @@ void Scumm::stopObjectScript(int script)
ss = &vm.slot[1];
for (i = 1; i < NUM_SCRIPT_SLOT; i++, ss++) {
if (script == ss->number && (ss->where == WIO_ROOM ||
ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)
&& ss->status != ssDead) {
if (script == ss->number && ss->status != ssDead &&
(ss->where == WIO_ROOM || ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)) {
if (ss->cutsceneOverride)
error("Object %d stopped with active cutscene/override", script);
ss->number = 0;