[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.68,2.69 string.cpp,1.68,1.69

[Max Horn]

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

Modified Files:
	script_v8.cpp string.cpp 
Log Message:
cleanup

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.68
retrieving revision 2.69
diff -u -d -r2.68 -r2.69
--- script_v8.cpp	27 Dec 2002 16:52:59 -0000	2.68
+++ script_v8.cpp	27 Dec 2002 16:55:22 -0000	2.69
@@ -875,7 +875,7 @@
 		break;
 	case 0xE7: {		// SO_CHARSET_SET
 		int charset = pop();
-		warning("Set userface charset to %d\n", charset);
+		warning("Set userface charset to %d", charset);
 //		loadCharset(charset);
 		break;
 	}
@@ -1336,7 +1336,7 @@
 {
 	int len = resStrLen((char*)_scriptPointer);
 	
-	warning("o8_startVideo(%s/%s)\n", getGameDataPath(), (char*)_scriptPointer);
+	warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer);
 	
 	//ScummRenderer * sr = new ScummRenderer(this, 1000/14);
 	//SmushPlayer * sp = new SmushPlayer(sr);

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- string.cpp	27 Dec 2002 16:49:08 -0000	1.68
+++ string.cpp	27 Dec 2002 16:55:22 -0000	1.69
@@ -485,11 +485,8 @@
 	// and never time out. We can't do it blindly for all games, because
 	// it causes problem with the FOA intro.
 
-	if ((_gameId == GID_FT || _features & GF_AFTER_V8) && a == 4)
+	if (_gameId == GID_FT && a == 4)
 		_talkDelay = -1;
-
-	if (_features & GF_AFTER_V8)
-		printf("Drawing string '%s'\n", buf);
 
 	if (!buf[0]) {
 		buf[0] = ' ';