[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.32,2.33 string.cpp,1.247,1.248

[Travis Howell]

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

Modified Files:
	script_v72he.cpp string.cpp 
Log Message:

Clean up


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- script_v72he.cpp	28 Aug 2004 14:48:51 -0000	2.32
+++ script_v72he.cpp	29 Aug 2004 03:19:44 -0000	2.33
@@ -899,7 +899,7 @@
 	int b =	pop();
 	int c =	pop();
 	int d =	pop();
-	warning("o72_unknownCE stub (%d, %d, %d, %d)", d, c, b, a);
+	debug(1,"o72_unknownCE stub (%d, %d, %d, %d)", d, c, b, a);
 }
 
 void ScummEngine_v72he::shuffleArray(int num, int minIdx, int maxIdx) {
@@ -1283,13 +1283,13 @@
 		pop();
 		break;
 	}
-	warning("o72_unknownFB stub");
+	debug(1, "o72_unknownFB stub");
 }
 
 void ScummEngine_v72he::o72_unknownFC() {
 	int a =	pop();
 	int b =	pop();
-	warning("o7_unknownFB stub (%d, %d)", b, a);
+	debug(1,"o7_unknownFC stub (%d, %d)", b, a);
 	push(0);
 }
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- string.cpp	29 Aug 2004 01:24:16 -0000	1.247
+++ string.cpp	29 Aug 2004 03:19:44 -0000	1.248
@@ -249,12 +249,12 @@
 
 				_sound->talkSound(talk_sound_a, talk_sound_b, 2);
 				break;
-			case 110:
-				goto newLine;
 			case 104:
 				_haveMsg = 0;
 				_keepText = true;
 				break;
+			case 110:
+				goto newLine;
 			case 119:
 				if (_haveMsg != 0xFE)
 					_haveMsg = 0xFF;