[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.143,2.144 script_v6he.cpp,2.26,2.27 scumm.h,1.373,1.374 scummvm.cpp,2.585,2.586

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3437/scumm

Modified Files:
	intern.h script_v6he.cpp scumm.h scummvm.cpp 
Log Message:

Rename a few opcodes



Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.143
retrieving revision 2.144
diff -u -d -r2.143 -r2.144
--- intern.h	23 Feb 2004 00:59:34 -0000	2.143
+++ intern.h	24 Feb 2004 00:43:01 -0000	2.144
@@ -562,6 +562,9 @@
 	void redimArray(int arrayId, int newX, int newY, int d);
 	int readFileToArray(int slot, int32 size);
 	void writeFileFromArray(int slot, int resID);
+	int kernelGetFunctions1(byte *addr, int arg1, int arg2, int arg3, int agr4);
+	void kernelSetFunctions1(byte *addr);
+	void seekFilePos(int slot, int offset, int mode);
 
 	/* Version 6 script opcodes */
 	void o6_drawBlastObject();
@@ -584,17 +587,14 @@
 	void o6_rename();
 	void o6_writeFile();
 	void o6_setVolume();
-	void o6_seekFile();
+	void o6_seekFilePos();
 	void o6_localizeArray();
 	void o6_unknownEE();
 	void o6_unknownFA();
 	void o6_redimArray();
 	void o6_readINI();
 	void o6_unknownF9();
-	void o6_tellFile();
-	void kernelSetFunctions1(byte *addr);
-	int kernelGetFunctions1(byte *addr, int arg1, int arg2, int arg3, int agr4);
-	void seekWrapper(int slot, int offset, int mode);
+	void o6_readFilePos();
 };
 
 class ScummEngine_v7 : public ScummEngine_v6 {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -d -r2.26 -r2.27
--- script_v6he.cpp	23 Feb 2004 04:01:39 -0000	2.26
+++ script_v6he.cpp	24 Feb 2004 00:43:01 -0000	2.27
@@ -338,9 +338,9 @@
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_seekFile),
+		OPCODE(o6_seekFilePos),
 		OPCODE(o6_redimArray),
-		OPCODE(o6_tellFile),
+		OPCODE(o6_readFilePos),
 		/* EC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -1132,7 +1132,7 @@
 	_scriptPointer += len + 1;
 }
 
-void ScummEngine_v6he::o6_seekFile() {
+void ScummEngine_v6he::o6_seekFilePos() {
 	int mode, offset, slot;
 	mode = pop();
 	offset = pop();
@@ -1142,20 +1142,20 @@
 
 	switch (mode) {
 	case 1:
-		seekWrapper(slot, offset, 0);
+		seekFilePos(slot, offset, 0);
 		break;
 	case 2:
-		seekWrapper(slot, offset, 1);
+		seekFilePos(slot, offset, 1);
 		break;
 	case 3:
-		seekWrapper(slot, offset, 2);
+		seekFilePos(slot, offset, 2);
 		break;
 	default:
 		break;
 	}
 }
 
-void ScummEngine_v6he::seekWrapper(int slot, int offset, int mode) {
+void ScummEngine_v6he::seekFilePos(int slot, int offset, int mode) {
 	if (slot == 1)
 		return;
 
@@ -1172,7 +1172,7 @@
 	}
 }
 
-void ScummEngine_v6he::o6_tellFile() {
+void ScummEngine_v6he::o6_readFilePos() {
 	int slot = pop();
 
 	debug(1, "o6_tellFile(%d)", slot);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- scumm.h	23 Feb 2004 02:07:56 -0000	1.373
+++ scumm.h	24 Feb 2004 00:43:01 -0000	1.374
@@ -228,7 +228,7 @@
 	GID_FBEAR,
 	GID_PJSDEMO,
 	GID_MONKEY_SEGA,
-	GID_FBEARPACK
+	GID_FBPACK
 };
 
 #define _baseRooms res.address[rtRoom]

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.585
retrieving revision 2.586
diff -u -d -r2.585 -r2.586
--- scummvm.cpp	23 Feb 2004 02:07:56 -0000	2.585
+++ scummvm.cpp	24 Feb 2004 00:43:01 -0000	2.586
@@ -164,7 +164,7 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"funpack", "Putt-Putt's Fun Pack", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
-	{"fbpack", "Fatty Bear's Fun Pack", GID_FBEARPACK, 6, MDT_ADLIB | MDT_NATIVE,
+	{"fbpack", "Fatty Bear's Fun Pack", GID_FBPACK, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	{"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},