[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.82,2.83 script_v2.cpp,2.68,2.69 script_v5.cpp,1.77,1.78 script_v6.cpp,1.113,1.114 script_v8.cpp,2.155,2.156 scumm.h,1.188,1.189

Max Horn fingolfin at users.sourceforge.net
Wed May 14 13:38:12 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8949

Modified Files:
	intern.h script_v2.cpp script_v5.cpp script_v6.cpp 
	script_v8.cpp scumm.h 
Log Message:
opcodes are just one byte

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.82
retrieving revision 2.83
diff -u -d -r2.82 -r2.83
--- intern.h	14 May 2003 10:16:57 -0000	2.82
+++ intern.h	14 May 2003 20:37:52 -0000	2.83
@@ -41,8 +41,8 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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();
 

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.68
retrieving revision 2.69
diff -u -d -r2.68 -r2.69
--- script_v2.cpp	14 May 2003 14:22:15 -0000	2.68
+++ script_v2.cpp	14 May 2003 20:37:53 -0000	2.69
@@ -357,12 +357,12 @@
 	_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;
 }
 

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- script_v5.cpp	13 May 2003 23:42:40 -0000	1.77
+++ script_v5.cpp	14 May 2003 20:37:53 -0000	1.78
@@ -357,12 +357,12 @@
 	_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;
 }
 

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- script_v6.cpp	14 May 2003 20:14:03 -0000	1.113
+++ script_v6.cpp	14 May 2003 20:37:53 -0000	1.114
@@ -366,12 +366,12 @@
 	_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;
 }
 

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.155
retrieving revision 2.156
diff -u -d -r2.155 -r2.156
--- script_v8.cpp	14 May 2003 10:16:57 -0000	2.155
+++ script_v8.cpp	14 May 2003 20:37:53 -0000	2.156
@@ -361,12 +361,12 @@
 	_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;
 }
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- scumm.h	14 May 2003 13:30:52 -0000	1.188
+++ scumm.h	14 May 2003 20:37:53 -0000	1.189
@@ -497,8 +497,8 @@
 	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();





More information about the Scummvm-git-logs mailing list