aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Montoir2011-02-17 16:11:55 +0100
committerGregory Montoir2011-02-18 15:20:31 +0100
commit8a5078966290a3fbc0ee78d662cafa66a910b029 (patch)
tree94b174476e07e7585940df0c67d21ae17a4fbbb6
parent34f428ea9123840f1a4d45f0f3a9cc9fcd9d1b9e (diff)
downloadscummvm-rg350-8a5078966290a3fbc0ee78d662cafa66a910b029.tar.gz
scummvm-rg350-8a5078966290a3fbc0ee78d662cafa66a910b029.tar.bz2
scummvm-rg350-8a5078966290a3fbc0ee78d662cafa66a910b029.zip
TOUCHE: fix op_not/op_neg opcodes naming
-rw-r--r--engines/touche/opcodes.cpp12
-rw-r--r--engines/touche/touche.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp
index b2b16eb29d..5df0ca3548 100644
--- a/engines/touche/opcodes.cpp
+++ b/engines/touche/opcodes.cpp
@@ -41,7 +41,7 @@ void ToucheEngine::setupOpcodes() {
&ToucheEngine::op_true,
&ToucheEngine::op_false,
&ToucheEngine::op_push,
- &ToucheEngine::op_testFalse,
+ &ToucheEngine::op_not,
/* 0x08 */
&ToucheEngine::op_add,
&ToucheEngine::op_sub,
@@ -51,7 +51,7 @@ void ToucheEngine::setupOpcodes() {
&ToucheEngine::op_mod,
&ToucheEngine::op_and,
&ToucheEngine::op_or,
- &ToucheEngine::op_not,
+ &ToucheEngine::op_neg,
/* 0x10 */
&ToucheEngine::op_testGreater,
&ToucheEngine::op_testEquals,
@@ -250,8 +250,8 @@ void ToucheEngine::op_push() {
*_script.stackDataPtr = 0;
}
-void ToucheEngine::op_testFalse() {
- debugC(9, kDebugOpcodes, "ToucheEngine::op_testFalse()");
+void ToucheEngine::op_not() {
+ debugC(9, kDebugOpcodes, "ToucheEngine::op_not()");
if (*_script.stackDataPtr == 0) {
*_script.stackDataPtr = -1;
} else {
@@ -309,8 +309,8 @@ void ToucheEngine::op_or() {
*_script.stackDataPtr |= val;
}
-void ToucheEngine::op_not() {
- debugC(9, kDebugOpcodes, "ToucheEngine::op_not()");
+void ToucheEngine::op_neg() {
+ debugC(9, kDebugOpcodes, "ToucheEngine::op_neg()");
uint16 val = *_script.stackDataPtr;
*_script.stackDataPtr = ~val;
}
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index 50a5c6e439..8b5f14d926 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -531,7 +531,7 @@ protected:
void op_true();
void op_false();
void op_push();
- void op_testFalse();
+ void op_not();
void op_add();
void op_sub();
void op_mul();
@@ -539,7 +539,7 @@ protected:
void op_mod();
void op_and();
void op_or();
- void op_not();
+ void op_neg();
void op_testGreater();
void op_testEquals();
void op_testLower();