[Scummvm-cvs-logs] CVS: scummvm/scumm bundle.cpp,1.36,1.37 gfx.cpp,2.110,2.111 resource_v2.cpp,1.15,1.16 resource_v3.cpp,1.16,1.17 script_v5.cpp,1.83,1.84 script_v8.cpp,2.159,2.160

[Max Horn]

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

Modified Files:
	bundle.cpp gfx.cpp resource_v2.cpp resource_v3.cpp 
	script_v5.cpp script_v8.cpp 
Log Message:
warning() automatically outputs a newline after the warning message; adding a newline into the format string adds another newline (which contains the single char '!')

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- bundle.cpp	7 Apr 2003 16:04:25 -0000	1.36
+++ bundle.cpp	18 May 2003 21:14:47 -0000	1.37
@@ -413,7 +413,7 @@
 			return number;
 		}
 	}
-	warning("Couldn't find numsample %s\n", name);
+	warning("Couldn't find numsample %s", name);
 	return number;
 }
 

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.110
retrieving revision 2.111
diff -u -d -r2.110 -r2.111
--- gfx.cpp	18 May 2003 19:51:50 -0000	2.110
+++ gfx.cpp	18 May 2003 21:14:47 -0000	2.111
@@ -2886,7 +2886,7 @@
 	num = end - start;
 
 	if (!endptr) {
-		warning("moveMemInPalRes(%d,%d): Bad end pointer\n", start, end);
+		warning("moveMemInPalRes(%d,%d): Bad end pointer", start, end);
 		return;
 	}
 
@@ -2916,7 +2916,7 @@
 	string2 = getStringAddress(string_id + 1);
 	string3 = getStringAddress(string_id + 2);
 	if (!string1 || !string2 || !string3) {
-		warning("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d\n",
+		warning("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d",
 		        start, end, string_id, time, string_id, string_id + 1, string_id + 2);
 		return;
 	}

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- resource_v2.cpp	4 May 2003 00:24:34 -0000	1.15
+++ resource_v2.cpp	18 May 2003 21:14:48 -0000	1.16
@@ -34,7 +34,7 @@
 
 	magic = _fileHandle.readUint16LE();
 	if (magic != 0x0100)
-		warning("The magic id doesn't match (0x%X)\n", magic);
+		warning("The magic id doesn't match (0x%X)", magic);
 
 	_numGlobalObjects = _fileHandle.readUint16LE();
 	_fileHandle.seek(_numGlobalObjects, SEEK_CUR); // Skip object flags

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- resource_v3.cpp	29 Apr 2003 10:26:35 -0000	1.16
+++ resource_v3.cpp	18 May 2003 21:14:48 -0000	1.17
@@ -36,7 +36,7 @@
 
 		magic = _fileHandle.readUint16LE();
 		if (magic != 0x0100)
-			warning("The magic id doesn't match (0x%X)\n", magic);
+			warning("The magic id doesn't match (0x%X)", magic);
 
 		_numGlobalObjects = _fileHandle.readUint16LE();
 		_fileHandle.seek(_numGlobalObjects * 4, SEEK_CUR);

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- script_v5.cpp	18 May 2003 02:22:26 -0000	1.83
+++ script_v5.cpp	18 May 2003 21:14:49 -0000	1.84
@@ -836,7 +836,7 @@
 		width = _charset->getStringWidth(0, ptr);
 	
 	setResult(width);
-	warning("o5_getStringWidth, result %d\n", width);
+	warning("o5_getStringWidth, result %d", width);
 }
 
 void Scumm_v5::o5_saveLoadVars() {
@@ -2464,7 +2464,7 @@
 			{
 			int a = getVarOrDirectWord(0x80);
 			int b = getVarOrDirectWord(0x40);
-			warning("Scumm_v5::decodeParseString: Unhandled case 3: %d, %d\n", a, b);
+			warning("Scumm_v5::decodeParseString: Unhandled case 3: %d, %d", a, b);
 			}
 			break;
 		case 4:										/* center */

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.159
retrieving revision 2.160
diff -u -d -r2.159 -r2.160
--- script_v8.cpp	18 May 2003 21:03:57 -0000	2.159
+++ script_v8.cpp	18 May 2003 21:14:49 -0000	2.160
@@ -1361,7 +1361,7 @@
 	case 11: {	// lockObject
 		int objidx = getObjectIndex(args[1]);
 		if (objidx == -1) {
-			warning("Cannot find object %d to lock\n", args[1]);
+			warning("Cannot find object %d to lock", args[1]);
 			break;
 		}
 
@@ -1375,7 +1375,7 @@
 	case 12: {	// unlockObject
 		int objidx = getObjectIndex(args[1]);
 		if (objidx == -1) {
-			warning("Cannot find object %d to unlock\n", args[1]);
+			warning("Cannot find object %d to unlock", args[1]);
 			break;
 		}
 
@@ -1452,7 +1452,7 @@
 		_saveLoadSlot = args[1];
 		_saveLoadFlag = 2;
 		_saveLoadCompatible = false;
-		warning("Sgl: %d\n", args[1]);
+		warning("Sgl: %d", args[1]);
 		break;
 	}
 	case 28:	// saveGameStampScreenshot
@@ -1520,7 +1520,7 @@
 				push(0);
 				break;
 			default:
-				warning("getKeyState(0x%X)\n", args[1]);
+				warning("getKeyState(0x%X)", args[1]);
 				push(0);
 				break;
 		}
@@ -1636,7 +1636,7 @@
 		}
 		break;
 	case 0xE1:		// imGetMusicPosition
-		warning("o8_kernelGetFunctions: imGetMusicPosition(stub)\n");
+		warning("o8_kernelGetFunctions: imGetMusicPosition(stub)");
 		// FIXME - get this stuff to be properly implemented
 		push(_sound->_bundleMusicPosition);
 		break;