aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/script.h
diff options
context:
space:
mode:
authorDavid Corrales2007-06-23 18:51:33 +0000
committerDavid Corrales2007-06-23 18:51:33 +0000
commitcacd7a28fd51d960947de88abbf30c487e66529d (patch)
treef3baa59853bfb307e452b86b9d93c4737b1fa6ab /engines/saga/script.h
parent0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff)
parent90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff)
downloadscummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2
scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'engines/saga/script.h')
-rw-r--r--engines/saga/script.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/saga/script.h b/engines/saga/script.h
index a8a0cd762b..ec3a7e1cf4 100644
--- a/engines/saga/script.h
+++ b/engines/saga/script.h
@@ -105,7 +105,8 @@ enum ThreadWaitTypes {
kWaitTypePause = 7,
kWaitTypePlacard = 8,
kWaitTypeStatusTextInput = 9,
- kWaitTypeWaitFrames = 10 // IHNM. waiting for a frame count
+ kWaitTypeWaitFrames = 10, // IHNM. waiting for a frame count
+ kWaitTypeWakeUp = 11 // IHNM. wait until get waken up
};
enum OpCodes {
@@ -326,6 +327,11 @@ public:
_sleepTime = sleepTime;
}
+ void waitFrames(int frames) {
+ wait(kWaitTypeWaitFrames);
+ _frameWait = frames;
+ }
+
ScriptThread() {
memset(this, 0xFE, sizeof(*this));
_stackBuf = NULL;
@@ -469,7 +475,7 @@ private:
void setThreadEntrypoint(ScriptThread *thread, int entrypointNumber);
public:
- void finishDialog(int replyID, int flags, int bitOffset);
+ void finishDialog(int strID, int replyID, int flags, int bitOffset);
private: