aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-14 20:37:53 +0000
committerMax Horn2003-05-14 20:37:53 +0000
commitf495c14d84e77ea1e6c38b4844c68b4f2cb915ab (patch)
tree2568860bdeb544f7a5acd247634126c790e23a17
parenteb22ea3b96b4e76b6ac717490d33abbb314acb62 (diff)
downloadscummvm-rg350-f495c14d84e77ea1e6c38b4844c68b4f2cb915ab.tar.gz
scummvm-rg350-f495c14d84e77ea1e6c38b4844c68b4f2cb915ab.tar.bz2
scummvm-rg350-f495c14d84e77ea1e6c38b4844c68b4f2cb915ab.zip
opcodes are just one byte
svn-id: r7513
-rw-r--r--scumm/intern.h16
-rw-r--r--scumm/script_v2.cpp4
-rw-r--r--scumm/script_v5.cpp4
-rw-r--r--scumm/script_v6.cpp4
-rw-r--r--scumm/script_v8.cpp4
-rw-r--r--scumm/scumm.h4
6 files changed, 18 insertions, 18 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 310006ae0b..30bb7303d4 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -41,8 +41,8 @@ public:
protected:
virtual void setupOpcodes();
- virtual void executeOpcode(int i);
- virtual const char *getOpcodeDesc(int i);
+ virtual void executeOpcode(byte i);
+ virtual const char *getOpcodeDesc(byte i);
virtual void decodeParseString();
int getWordVararg(int *ptr);
@@ -193,8 +193,8 @@ public:
protected:
virtual void setupOpcodes();
- virtual void executeOpcode(int i);
- virtual const char *getOpcodeDesc(int i);
+ virtual void executeOpcode(byte i);
+ virtual const char *getOpcodeDesc(byte i);
virtual void setupScummVars();
@@ -309,8 +309,8 @@ public:
protected:
virtual void setupOpcodes();
- virtual void executeOpcode(int i);
- virtual const char *getOpcodeDesc(int i);
+ virtual void executeOpcode(byte i);
+ virtual const char *getOpcodeDesc(byte i);
virtual void setupScummVars();
@@ -520,8 +520,8 @@ public:
protected:
virtual void setupOpcodes();
- virtual void executeOpcode(int i);
- virtual const char *getOpcodeDesc(int i);
+ virtual void executeOpcode(byte i);
+ virtual const char *getOpcodeDesc(byte i);
virtual void setupScummVars();
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 79df54a3a4..0821c5b532 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -357,12 +357,12 @@ void Scumm_v2::setupOpcodes() {
_opcodesV2 = opcodes;
}
-void Scumm_v2::executeOpcode(int i) {
+void Scumm_v2::executeOpcode(byte i) {
OpcodeProcV2 op = _opcodesV2[i].proc;
(this->*op) ();
}
-const char *Scumm_v2::getOpcodeDesc(int i) {
+const char *Scumm_v2::getOpcodeDesc(byte i) {
return _opcodesV2[i].desc;
}
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index a991ecb554..53a449246d 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -357,12 +357,12 @@ void Scumm_v5::setupOpcodes() {
_opcodesV5 = opcodes;
}
-void Scumm_v5::executeOpcode(int i) {
+void Scumm_v5::executeOpcode(byte i) {
OpcodeProcV5 op = _opcodesV5[i].proc;
(this->*op) ();
}
-const char *Scumm_v5::getOpcodeDesc(int i) {
+const char *Scumm_v5::getOpcodeDesc(byte i) {
return _opcodesV5[i].desc;
}
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index ed7b8caed4..dda4e05013 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -366,12 +366,12 @@ void Scumm_v6::setupOpcodes() {
_opcodesV6 = opcodes;
}
-void Scumm_v6::executeOpcode(int i) {
+void Scumm_v6::executeOpcode(byte i) {
OpcodeProcV6 op = _opcodesV6[i].proc;
(this->*op) ();
}
-const char *Scumm_v6::getOpcodeDesc(int i) {
+const char *Scumm_v6::getOpcodeDesc(byte i) {
return _opcodesV6[i].desc;
}
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 34d6174f19..02b02a0927 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -361,12 +361,12 @@ void Scumm_v8::setupOpcodes() {
_opcodesV8 = opcodes;
}
-void Scumm_v8::executeOpcode(int i) {
+void Scumm_v8::executeOpcode(byte i) {
OpcodeProcV8 op = _opcodesV8[i].proc;
(this->*op) ();
}
-const char *Scumm_v8::getOpcodeDesc(int i) {
+const char *Scumm_v8::getOpcodeDesc(byte i) {
return _opcodesV8[i].desc;
}
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 092dacaca4..ae65fa0566 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -497,8 +497,8 @@ protected:
int _keyScriptKey, _keyScriptNo;
virtual void setupOpcodes() = 0;
- virtual void executeOpcode(int i) = 0;
- virtual const char *getOpcodeDesc(int i) = 0;
+ virtual void executeOpcode(byte i) = 0;
+ virtual const char *getOpcodeDesc(byte i) = 0;
void initializeLocals(int slot, int *vars);
int getScriptSlot();