diff options
| author | Eugene Sandulenko | 2004-08-12 23:57:45 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-08-12 23:57:45 +0000 |
| commit | 3fe739efb24e72a97fd9212657cd692df8d97c90 (patch) | |
| tree | a063d8ab02f7cf19e179e4ae8c8f7e7504f30ac7 /saga/script.cpp | |
| parent | cdb88416a850cea68baab90685c14aa1d7624111 (diff) | |
| download | scummvm-rg350-3fe739efb24e72a97fd9212657cd692df8d97c90.tar.gz scummvm-rg350-3fe739efb24e72a97fd9212657cd692df8d97c90.tar.bz2 scummvm-rg350-3fe739efb24e72a97fd9212657cd692df8d97c90.zip | |
Merge SDEBUG_*, SF_* and STHREAD_* into Script class.
svn-id: r14568
Diffstat (limited to 'saga/script.cpp')
| -rw-r--r-- | saga/script.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/saga/script.cpp b/saga/script.cpp index f87fedc72b..bcb2170f63 100644 --- a/saga/script.cpp +++ b/saga/script.cpp @@ -31,9 +31,7 @@ #include "saga/console.h" #include "saga/cvar_mod.h" -#include "saga/script_mod.h" #include "saga/script.h" -#include "saga/sthread.h" namespace Saga { @@ -129,6 +127,8 @@ Script::Script() { // Initialize script submodules _threadList = ys_dll_create(); + setupScriptFuncList(); + _initialized = true; } @@ -151,7 +151,7 @@ Script::~Script() { for (thread_node = ys_dll_head(_threadList); thread_node != NULL; thread_node = ys_dll_next(thread_node)) { thread = (R_SCRIPT_THREAD *)ys_dll_get_data(thread_node); - STHREAD_Destroy(thread); + SThreadDestroy(thread); } _initialized = false; @@ -520,7 +520,7 @@ void Script::scriptExec(int argc, char *argv[]) { if (_dbg_thread == NULL) { _vm->_console->print("Creating debug thread..."); - _dbg_thread = STHREAD_Create(); + _dbg_thread = SThreadCreate(); if (_dbg_thread == NULL) { _vm->_console->print("Thread creation failed."); return; @@ -532,7 +532,7 @@ void Script::scriptExec(int argc, char *argv[]) { return; } - STHREAD_Execute(_dbg_thread, ep_num); + SThreadExecute(_dbg_thread, ep_num); } void CF_script_info(int argc, char *argv[], void *refCon) { |