diff options
author | Eugene Sandulenko | 2004-12-15 00:24:12 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2004-12-15 00:24:12 +0000 |
commit | 502b279d243d79f46bb8a151ae610949d30bf757 (patch) | |
tree | 7f17defd563f74aa4944c7f8c6da0bc9ffc81c1a /saga/script.h | |
parent | 58eabb6a5fdafed605fcb0cd8f56dbcea8723d46 (diff) | |
download | scummvm-rg350-502b279d243d79f46bb8a151ae610949d30bf757.tar.gz scummvm-rg350-502b279d243d79f46bb8a151ae610949d30bf757.tar.bz2 scummvm-rg350-502b279d243d79f46bb8a151ae610949d30bf757.zip |
Patch #1081904 ITE: MAC demo support
o Endianness-aware resource loading
o Removed ys_dl_list in favor of our object implementation
o Cleanup in actor code
o Partial support for ITE Mac rereleased demo
svn-id: r16051
Diffstat (limited to 'saga/script.h')
-rw-r--r-- | saga/script.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/saga/script.h b/saga/script.h index 6777393c55..2e36dd87cb 100644 --- a/saga/script.h +++ b/saga/script.h @@ -27,7 +27,7 @@ #define SAGA_SCRIPT_H #include "saga/text.h" -#include "saga/yslib.h" +#include "saga/list.h" namespace Saga { @@ -135,8 +135,12 @@ struct SCRIPT_THREAD { assert(stackPtr < ARRAYSIZE(stackBuf)); return stackBuf[stackPtr++]; } + + SCRIPT_THREAD() { memset(this, 0, sizeof(*this)); } }; +typedef SortedList<SCRIPT_THREAD> ScriptThreadList; + struct PROC_TBLENTRY { size_t name_offset; size_t offset; @@ -200,7 +204,7 @@ public: SCRIPTDATA *currentScript() { return _currentScript; } void setBuffer(int idx, SCRIPT_DATABUF *ptr) { _dataBuf[idx] = ptr; } SCRIPT_DATABUF *dataBuffer(int idx) { return _dataBuf[idx]; } - YS_DL_LIST *threadList() { return _threadList; } +// YS_DL_LIST *threadList() { return _threadList; } void scriptInfo(); void scriptExec(int argc, const char **argv); @@ -214,7 +218,7 @@ protected: uint16 _scriptLUTEntryLen; SCRIPTDATA *_currentScript; SCRIPT_DATABUF *_dataBuf[SCRIPT_DATABUF_NUM]; - YS_DL_LIST *_threadList; + ScriptThreadList _threadList; bool _skipSpeeches; bool _abortEnabled; |