diff options
author | Max Horn | 2003-09-11 10:32:15 +0000 |
---|---|---|
committer | Max Horn | 2003-09-11 10:32:15 +0000 |
commit | 81f10baa68d36f42f4988b971dff312439906a2f (patch) | |
tree | a58d9b322203713d9bc8a0de0531dfcab7c85904 /scumm/script_v5.cpp | |
parent | a3bb9f81e0502f66e368b5e58861ffbb5cfdcd41 (diff) | |
download | scummvm-rg350-81f10baa68d36f42f4988b971dff312439906a2f.tar.gz scummvm-rg350-81f10baa68d36f42f4988b971dff312439906a2f.tar.bz2 scummvm-rg350-81f10baa68d36f42f4988b971dff312439906a2f.zip |
cleanup
svn-id: r10169
Diffstat (limited to 'scumm/script_v5.cpp')
-rw-r--r-- | scumm/script_v5.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 6f831e854a..5f1395f40a 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -21,12 +21,13 @@ */ #include "stdafx.h" -#include "scumm.h" -#include "actor.h" -#include "charset.h" -#include "intern.h" -#include "sound.h" -#include "verbs.h" +#include "scumm/actor.h" +#include "scumm/charset.h" +#include "scumm/intern.h" +#include "scumm/object.h" +#include "scumm/scumm.h" +#include "scumm/sound.h" +#include "scumm/verbs.h" #define OPCODE(x) { &Scumm_v5::x, #x } @@ -623,7 +624,7 @@ void Scumm_v5::o5_chainScript() { } vm.slot[cur].number = 0; - vm.slot[cur].status = 0; + vm.slot[cur].status = ssDead; _currentScript = 0xFF; runScript(script, vm.slot[cur].freezeResistant, vm.slot[cur].recursive, vars); @@ -731,13 +732,13 @@ void Scumm_v5::o5_delay() { delay |= fetchScriptByte() << 8; delay |= fetchScriptByte() << 16; vm.slot[_currentScript].delay = delay; - vm.slot[_currentScript].status = 1; + vm.slot[_currentScript].status = ssPaused; o5_breakHere(); } void Scumm_v5::o5_delayVariable() { vm.slot[_currentScript].delay = getVar(); - vm.slot[_currentScript].status = 1; + vm.slot[_currentScript].status = ssPaused; o5_breakHere(); } |