[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.379,1.380 script_v6he.cpp,2.85,2.86

Travis Howell kirben at users.sourceforge.net
Sun Aug 22 02:18:00 CEST 2004


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

Modified Files:
	script_v6.cpp script_v6he.cpp 
Log Message:

No longer required


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -d -r1.379 -r1.380
--- script_v6.cpp	14 Aug 2004 19:41:59 -0000	1.379
+++ script_v6.cpp	22 Aug 2004 09:17:24 -0000	1.380
@@ -1544,7 +1544,6 @@
 			if (resid >= _numGlobalScripts)
 				break;
 		setResourceCounter(rtScript, resid, 0x7F);
-		debug(5, "nuke script %d", resid);
 		break;
 	case 105:		// SO_NUKE_SOUND
 		resid = pop();
@@ -2541,9 +2540,7 @@
 					_smushFrameRate = 14;
 				speed = 1000000 / _smushFrameRate;
 
-				debug(1, "INSANE Arg: %d %d", args[1], args[2]);
-
-				// INSANE mode 0: SMUSH movie playback
+				// SMUSH movie playback
 				if (args[1] == 0) {
 					assert(getStringAddressVar(VAR_VIDEONAME));
 					if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
@@ -2965,7 +2962,6 @@
 		if (state == 0)
 			state = 255;
 
-		//debug(6, "o6_stampObject: (%d at (%d,%d) scale %d)", object, x, y, state);
 		Actor *a = derefActor(object, "o6_stampObject");
 		a->scalex = state;
 		a->scaley = state;
@@ -2991,7 +2987,6 @@
 
 	putState(object, state);
 	drawObject(objnum, 0);
-	//debug(6, "o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state);
 }
 
 void ScummEngine_v6::o6_stopTalking() {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.85
retrieving revision 2.86
diff -u -d -r2.85 -r2.86
--- script_v6he.cpp	14 Aug 2004 19:42:00 -0000	2.85
+++ script_v6he.cpp	22 Aug 2004 09:17:24 -0000	2.86
@@ -768,7 +768,6 @@
 }
 
 void ScummEngine_v6he::virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2) {
-	debug(1, "ScummEngine_v6he::virtScreenLoad(%d, %d, %d, %d, %d)", resIdx, x1, y1, x2, y2);
 	vsUnpackCtx ctx;
 	memset(&ctx, 0, sizeof(ctx));
 	VirtScreen &vs = virtscr[kMainVirtScreen]; // XXX gdi_virtScreen = 0;
@@ -847,7 +846,6 @@
 }
 
 int ScummEngine_v6he::virtScreenSave(byte *dst, int x1, int y1, int x2, int y2) {
-	debug(1, "ScummEngine_v6he::virtScreenSave(%d, %d, %d, %d)", x1, y1, x2, y2);
 	int packedSize = 0;
 	VirtScreen &vs = virtscr[kMainVirtScreen]; // XXX gdi_virtScreen = 0;
 
@@ -984,14 +982,12 @@
 		if (_hFileTable[slot].isOpen() == false)
 			slot = -1;
 
-		debug(1, "%d = o6_openFile(\"%s\", %d)", slot, filename + r, mode);
 	}
 	push(slot);
 }
 
 void ScummEngine_v6he::o6_closeFile() {
 	int slot = pop();
-	debug(1, "o6_closeFile(%d)", slot);
 	if (slot != -1)
 		_hFileTable[slot].close();
 }
@@ -1057,8 +1053,6 @@
 	int slot = pop();
 	int val;
 
-	debug(1, "o6_readFile(%d, %d)", slot, size);
-
 	// Fatty Bear uses positive values
 	if ((_features & GF_PC) && (_gameId == GID_FBEAR))
 		size = -size;
@@ -1087,8 +1081,6 @@
 	int16 resID = pop();
 	int slot = pop();
 
-	debug(1, "o6_writeFile(%d, %d, %d)", slot, resID, size);
-
 	// Fatty Bear uses positive values
 	if ((_features & GF_PC) && (_gameId == GID_FBEAR))
 		size = -size;
@@ -1134,8 +1126,6 @@
 	offset = pop();
 	slot = pop();
 
-	debug(1, "o6_seekFile(%d, %d, %d)", slot, offset, mode);
-
 	switch (mode) {
 	case 1:
 		seekFilePos(slot, offset, 0);
@@ -1171,8 +1161,6 @@
 void ScummEngine_v6he::o6_readFilePos() {
 	int slot = pop();
 
-	debug(1, "o6_tellFile(%d)", slot);
-
 	if (slot == -1) {
 		push(0);
 		return;





More information about the Scummvm-git-logs mailing list