[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.236,1.237

Travis Howell kirben at users.sourceforge.net
Fri Jan 2 07:08:29 CET 2004


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

Modified Files:
	script_v6.cpp 
Log Message:

Add comments for HE specific opcodes
Update hack for PuttPutt
Add another small fix.


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- script_v6.cpp	2 Jan 2004 13:30:03 -0000	1.236
+++ script_v6.cpp	2 Jan 2004 15:07:14 -0000	1.237
@@ -1795,7 +1795,7 @@
 			if (a->top > top_actor) {
 				a->bottom = top_actor;
 			}
-			if (a->bottom > bottom_actor) {
+			if (a->bottom < bottom_actor) {
 				a->bottom = bottom_actor;
 			}
 		}
@@ -1934,7 +1934,7 @@
 		b = pop();
 		a = pop();
 		// HACK Prevent puttmoon from loading no existant objects.
-		if ((_gameId == GID_PUTTPUTT) && (a < 700 || a > 900))
+		if ((_gameId == GID_PUTTPUTT) && (a < 700 || a == 776 || a > 900))
 			break;
 
 		if (slot && a != vs->imgindex) {
@@ -2978,6 +2978,7 @@
 	stopTalk();
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_openFile() {
 	int mode, len, slot, l, r;
 	byte filename[100];
@@ -3016,12 +3017,14 @@
 	push(slot);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_closeFile() {
 	int slot = pop();
 	_hFileTable[slot].close();
 	warning("o6_closeFile(%d)", slot);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_deleteFile() {
 	int len, r;
 	byte filename[100];
@@ -3041,6 +3044,7 @@
 	warning("stub o6_deleteFile(\"%s\")", filename + r);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_rename() {
 	int len, r1, r2;
 	byte filename[100],filename2[100];
@@ -3082,6 +3086,7 @@
 	return readVar(0);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_readFile() {
 	int32 size = pop();
 	int slot = pop();
@@ -3103,6 +3108,7 @@
 	_hFileTable[slot].write(ptr, size);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_writeFile() {
 	int32 size = pop();
 	int16 resID = pop();
@@ -3118,6 +3124,7 @@
 	warning("o6_writeFile(%d, %d)", slot, resID);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_findAllObjects() {
 	// FIXME verifty correctness of this opcode
 	int a = pop();
@@ -3256,6 +3263,7 @@
 	push(area);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_unknownE0() {
 	int a = fetchScriptByte();
 	a -= 222;
@@ -3269,10 +3277,12 @@
 	}
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_unknownE4() {
 	warning("o6_unknownE4(%d) stub", pop());
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_unknownFA() {
 	int len, a = fetchScriptByte();
 	
@@ -3281,6 +3291,7 @@
 	_scriptPointer += len + 1;
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_unknownEA() {
 	int edi, esi, eax;
 	edi = pop();
@@ -3309,6 +3320,7 @@
 	warning("unknownEA_func(%d, %d, %d, %d, %d) stub", a, b, c, d, e);
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_readINI() {
 	int len;
 
@@ -3320,6 +3332,7 @@
 	
 }
 
+// Humongous Entertainment games only
 void ScummEngine_v6::o6_localizeArray() {
 	warning("stub localizeArray(%d)", pop());
 }





More information about the Scummvm-git-logs mailing list