aboutsummaryrefslogtreecommitdiff
path: root/sword2/interpreter.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-10-21 08:54:50 +0000
committerTorbjörn Andersson2003-10-21 08:54:50 +0000
commit3be2f0f1e08fc191e9f092380845919778e77a58 (patch)
treea3f45971b122f2598e0ea4713aa204c7cf18ba6d /sword2/interpreter.cpp
parented0c30fcbf7f0fdd2633451c894ea7bd4980076c (diff)
downloadscummvm-rg350-3be2f0f1e08fc191e9f092380845919778e77a58.tar.gz
scummvm-rg350-3be2f0f1e08fc191e9f092380845919778e77a58.tar.bz2
scummvm-rg350-3be2f0f1e08fc191e9f092380845919778e77a58.zip
Moved some more stuff into the Logic class.
svn-id: r10923
Diffstat (limited to 'sword2/interpreter.cpp')
-rw-r--r--sword2/interpreter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp
index 4b16528db9..bf1161180d 100644
--- a/sword2/interpreter.cpp
+++ b/sword2/interpreter.cpp
@@ -215,11 +215,11 @@ int32 Logic::executeOpcode(int i, int32 *params) {
#define POPOFFSTACK(x) { x = stack2[stackPointer2 - 1]; stackPointer2--; CHECKSTACKPOINTER2 }
#define DOOPERATION(x) { stack2[stackPointer2 - 2] = (x); stackPointer2--; CHECKSTACKPOINTER2 }
-void SetGlobalInterpreterVariables(int32 *vars) {
+void Logic::setGlobalInterpreterVariables(int32 *vars) {
globalInterpreterVariables2 = vars;
}
-int RunScript(char *scriptData, char *objectData, uint32 *offset) {
+int Logic::runScript(char *scriptData, char *objectData, uint32 *offset) {
#define STACK_SIZE 10
_standardHeader *header = (_standardHeader *) scriptData;
@@ -329,7 +329,7 @@ int RunScript(char *scriptData, char *objectData, uint32 *offset) {
Read8ip(value);
debug(5, "Call mcode %d with stack = %x", parameter, stack2 + stackPointer2 - value);
- retVal = g_logic.executeOpcode(parameter, stack2 + stackPointer2 - value);
+ retVal = executeOpcode(parameter, stack2 + stackPointer2 - value);
stackPointer2 -= value;
CHECKSTACKPOINTER2