The error() and warning() functions add ! and newline automatically. (I didn't

look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061

10 files changed, 25 insertions, 25 deletions

diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp
index c19c77a8ee..4bc7cb5433 100644
--- a/engines/tinsel/bg.cpp
+++ b/engines/tinsel/bg.cpp
@@ -162,7 +162,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
 		for (;;) {
 			for (int i = 0; i < bgReels; i++) {
 				if (StepAnimScript(&thisAnim[i]) == ScriptFinished)
-					error("Background animation has finished!");
+					error("Background animation has finished");
 			}
 
 			CORO_SLEEP(1);
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index dad86f9d43..1df932f1af 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -740,12 +740,12 @@ static void InitialiseBMV(void) {
 	// Grab the data buffer
 	bigBuffer = (byte *)malloc(NUM_SLOTS * SLOT_SIZE);
 	if (bigBuffer == NULL)
-		error(NO_MEM, "FMV data buffer\n");
+		error(NO_MEM, "FMV data buffer");
 
 	// Screen buffer (2 lines more than screen
 	screenBuffer = (byte *)malloc(SCREEN_WIDTH * (SCREEN_HIGH + 2));
 	if (screenBuffer == NULL)
-		error(NO_MEM, "FMV screen buffer\n");
+		error(NO_MEM, "FMV screen buffer");
 
 	// Pass the sceen buffer to the decompresser
 	InitBMV(screenBuffer);
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 63db3e119e..d395027ad9 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -1107,7 +1107,7 @@ static void PrimeSceneHopper(void) {
 	pBuffer = (char *)malloc(size);
 	if (pBuffer == NULL)
 		// cannot alloc buffer for index
-		error(NO_MEM, "Scene hopper data\n");
+		error(NO_MEM, "Scene hopper data");
 
 	// load data
 	if (f.read(pBuffer, size) != size)
diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp
index 6803ababa2..864c554b9c 100644
--- a/engines/tinsel/drives.cpp
+++ b/engines/tinsel/drives.cpp
@@ -54,10 +54,10 @@ void CdCD(CORO_PARAM) {
 			//        functions. If these functions really get called while a CD
 			//        change is requested, this needs to be resolved.
 			if (coroParam == nullContext)
-				error("CdCD needs context!");
+				error("CdCD needs context");
 			CORO_SLEEP(1);
 		} else
-			error("No current process in CdCD()!");
+			error("No current process in CdCD()");
 	}
 
 	CORO_END_CODE;
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index 220bf57aca..9a0e1f37f8 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -299,7 +299,7 @@ void LoadFile(MEMHANDLE *pH, bool bWarn) {
 	char szFilename[sizeof(pH->szName) + 1];
 
 	if (pH->filesize & fCompressed) {
-		error("Compression handling has been removed!");
+		error("Compression handling has been removed");
 	}
 
 	// extract and zero terminate the filename
@@ -383,7 +383,7 @@ byte *LockMem(SCNHANDLE offset) {
 	} else if (handle == cdPlayHandle) {
 		// Must be in currently loaded/loadable range
 		if (offset < cdBaseHandle || offset >= cdTopHandle)
-			error("Overlapping (in time) CD-plays!");
+			error("Overlapping (in time) CD-plays");
 
 		if (pH->pNode->pBaseAddr && (pH->filesize & fLoaded))
 			// already allocated and loaded
diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp
index a7cf95bc62..cb20bac627 100644
--- a/engines/tinsel/mareels.cpp
+++ b/engines/tinsel/mareels.cpp
@@ -118,7 +118,7 @@ SCNHANDLE GetMoverTalkReel(PMOVER pActor, TFTYPE dirn) {
 		return pActor->talkReels[pActor->scale-1][RIGHTREEL];
 
 	default:
-		error("GetMoverTalkReel() - illegal direction!");
+		error("GetMoverTalkReel() - illegal direction");
 	}
 }
 
diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp
index f7309bc38c..bb2daea206 100644
--- a/engines/tinsel/polygons.cpp
+++ b/engines/tinsel/polygons.cpp
@@ -1272,7 +1272,7 @@ HPOLYGON FirstPathPoly(void) {
 		if (Polys[i]->polyType == PATH)
 			return i;
 	}
-	error("FirstPathPoly() - no PATH polygons!");
+	error("FirstPathPoly() - no PATH polygons");
 	return NOPOLY;
 }
 
@@ -1460,7 +1460,7 @@ static void SetExBlocks() {
 				Polys[i]->polyType = EX_BLOCK;
 #ifdef DEBUG
 			else
-				error("Impossible message!");
+				error("Impossible message");
 #endif
 		}
 	}
@@ -1785,7 +1785,7 @@ static void KillDeadPolygons(void) {
 				break;
 
 			default:
-				error("Impossible message!");
+				error("Impossible message");
 			}
 		}
 	}
diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp
index 03ca9c074d..5a46da4e05 100644
--- a/engines/tinsel/rince.cpp
+++ b/engines/tinsel/rince.cpp
@@ -635,7 +635,7 @@ void SetMoverWalkReel(PMOVER pMover, DIRECTION reel, int scale, bool force) {
 		if (pMover->scale != scale
 				&& scale <= NUM_MAINSCALES && pMover->scale <= NUM_MAINSCALES
 				&& (whichReel = ScalingReel(pMover->actorID, pMover->scale, scale, reel)) != 0) {
-//			error("Cripes!");
+//			error("Cripes");
 			;	// Use what is now in 'whichReel'
 		} else {
 			whichReel = pMover->walkReels[scale-1][reel];
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index b8a92572eb..6f0c471878 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -139,7 +139,7 @@ void ChangeLanguage(LANGUAGE newLang) {
 		// close the file
 		f.close();
 	} else {	// the file must be compressed
-		error("Compression handling has been removed!");
+		error("Compression handling has been removed");
 	}
 }
 
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 541aba2c07..b73a66b6d3 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4244,7 +4244,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 	case ACTORREF:
 		// Common to both DW1 & DW2
 		if (!TinselV0)
-			error("actorref isn't a real function!");
+			error("actorref isn't a real function");
 		return 0;
 
 	case ACTORRGB:
@@ -4377,7 +4377,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case CALLSCENE:
 		// DW2 only
-		error("CallScene isn't a real function!");
+		error("CallScene isn't a real function");
 
 	case CALLTAG:
 		// DW2 only
@@ -4433,7 +4433,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case CDPLAY:
 		// Common to both DW1 & DW2
-		error("cdplay isn't a real function!");
+		error("cdplay isn't a real function");
 
 	case CLEARHOOKSCENE:
 		// Common to both DW1 & DW2
@@ -4477,7 +4477,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case CUTSCENE:
 		// DW1 only
-		error("cutscene isn't a real function!");
+		error("cutscene isn't a real function");
 
 	case DECCONVW:
 		// Common to both DW1 & DW2
@@ -4500,7 +4500,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 	case DECFLAGS:
 		// Common to both DW1 & DW2
 		if (TinselV2)
-			error("DecFlags() is obsolete!");
+			error("DecFlags() is obsolete");
 
 		DecFlags(pp[0]);
 		return -1;
@@ -4591,7 +4591,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case DROPOUT:
 		// DW1 only
-		error("DropOut (%d)\n", pp[0]);
+		error("DropOut (%d)", pp[0]);
 
 	case EFFECTACTOR:
 		// Common to both DW1 & DW2
@@ -4614,7 +4614,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 	case ESCAPEOFF:
 	case ESCAPEON:
 		// Common to both DW1 & DW2
-		error("Escape isn't a real function!");
+		error("Escape isn't a real function");
 
 	case EVENT:
 		// Common to both DW1 & DW2
@@ -4666,7 +4666,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case GLOBALVAR:
 		// DW1 only
-		error("GlobalVar isn't a real function!");
+		error("GlobalVar isn't a real function");
 
 	case GRABMOVIE:
 		// DW2 only
@@ -4794,7 +4794,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 	case KILLACTOR:
 		// DW1 only
 		if (TinselV2)
-			error("KillActor() was not expected to be required!");
+			error("KillActor() was not expected to be required");
 
 		KillActor(pp[0]);
 		return -1;
@@ -4826,7 +4826,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case LOCALVAR:
 		// DW2 only
-		error("LocalVar isn't a real function!");
+		error("LocalVar isn't a real function");
 
 	case MOVECURSOR:
 		// Common to both DW1 & DW2
@@ -4941,7 +4941,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case PLAYRTF:
 		// Common to both DW1 & DW2
-		error("playrtf only applies to cdi!");
+		error("playrtf only applies to cdi");
 
 	case PLAYSAMPLE:
 		// Common to both DW1 & DW2