7 files changed, 14 insertions, 14 deletions
diff --git a/engines/sword1/eventman.cpp b/engines/sword1/eventman.cpp
index 073cd72b5e..59841c12ea 100644
--- a/engines/sword1/eventman.cpp
+++ b/engines/sword1/eventman.cpp
@@ -98,7 +98,7 @@ void EventManager::fnIssueEvent(Object *compact, int32 id, int32 event, int32 de
 	while (_eventPendingList[evSlot].delay)
 		evSlot++;
 	if (evSlot >= TOTAL_EVENT_SLOTS)
-		error("EventManager ran out of event slots!");
+		error("EventManager ran out of event slots");
 	_eventPendingList[evSlot].delay = delay;
 	_eventPendingList[evSlot].eventNumber = event;
 }
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 211fe51179..8b033d9e8d 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -256,7 +256,7 @@ void Logic::processLogic(Object *compact, uint32 id) {
 			break;
 
 		default:
-			error("Fatal error: compact %d's logic == %X!", id, compact->o_logic);
+			error("Fatal error: compact %d's logic == %X", id, compact->o_logic);
 			break;
 		}
 	} while (logicRet);
@@ -447,7 +447,7 @@ int Logic::scriptManager(Object *compact, uint32 id) {
 			if (compact->o_tree.o_script_level)
 				compact->o_tree.o_script_level--;
 			else
-				error("ScriptManager: basescript %d for cpt %d ended!", script, id);
+				error("ScriptManager: basescript %d for cpt %d ended", script, id);
 		} else
 			compact->o_tree.o_script_pc[level] = ret;
 	} while (!ret);
@@ -475,9 +475,9 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
 	int32 offset;
 	int32 pc;
 	if (memcmp(scriptModule->type, "Script", 6))
-		error("Invalid script module!");
+		error("Invalid script module");
 	if (scriptModule->version != SCRIPT_VERSION)
-		error("Illegal script version!");
+		error("Illegal script version");
 	if (scriptNum < 0)
 		error("negative script number");
 	if ((uint32)scriptNum >= scriptModule->decomp_length)
@@ -1511,7 +1511,7 @@ int Logic::fnIsFacing(Object *cpt, int32 id, int32 targetId, int32 b, int32 c, i
 		y = target->o_ycoord;
 		dir = target->o_dir;
 	} else
-		error("fnIsFacing:: Target isn't a mega!");
+		error("fnIsFacing:: Target isn't a mega");
 
 	int32 lookDir = whatTarget(x, y, cpt->o_xcoord, cpt->o_ycoord);
 	lookDir -= dir;
diff --git a/engines/sword1/memman.cpp b/engines/sword1/memman.cpp
index d566c653b2..f6e4e17658 100644
--- a/engines/sword1/memman.cpp
+++ b/engines/sword1/memman.cpp
@@ -37,7 +37,7 @@ MemMan::MemMan(void) {
 MemMan::~MemMan(void) {
 	flush();
 	if (_alloced)
-		warning("deleting MemMan, still %d bytes alloced\n", _alloced);
+		warning("deleting MemMan, still %d bytes alloced", _alloced);
 }
 
 void MemMan::alloc(MemHandle *bsMem, uint32 pSize, uint16 pCond) {
diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index afd17b118c..703f422b8b 100644
--- a/engines/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
@@ -136,7 +136,7 @@ uint32 ObjectMan::lastTextNumber(int section) {
 Object *ObjectMan::fetchObject(uint32 id) {
 	uint8 *addr = _cptData[id / ITM_PER_SEC];
 	if (!addr)
-		error("fetchObject: section %d is not open!", id / ITM_PER_SEC);
+		error("fetchObject: section %d is not open", id / ITM_PER_SEC);
 	id &= ITM_ID;
 	// DON'T do endian conversion here. it's already done.
 	return (Object*)(addr + *(uint32*)(addr + (id + 1)*4));
@@ -144,7 +144,7 @@ Object *ObjectMan::fetchObject(uint32 id) {
 
 uint32 ObjectMan::fetchNoObjects(int section) {
 	if (_cptData[section] == NULL)
-		error("fetchNoObjects: section %d is not open!", section);
+		error("fetchNoObjects: section %d is not open", section);
 	return *(uint32*)_cptData[section];
 }
 
diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp
index 7e067cd1a0..979bd3210a 100644
--- a/engines/sword1/resman.cpp
+++ b/engines/sword1/resman.cpp
@@ -230,7 +230,7 @@ void ResMan::dumpRes(uint32 id) {
 
 Header *ResMan::lockScript(uint32 scrID) {
 	if (!_scriptList[scrID / ITM_PER_SEC])
-		error("Script id %d not found.\n", scrID);
+		error("Script id %d not found", scrID);
 	scrID = _scriptList[scrID / ITM_PER_SEC];
 #ifdef SCUMM_BIG_ENDIAN
 	openScriptResourceBigEndian(scrID);
@@ -266,7 +266,7 @@ void ResMan::resOpen(uint32 id) {  // load resource ID into memory
 		clusFile->seek( resOffset(id) );
 		clusFile->read( memHandle->data, size);
 		if (clusFile->ioFailed()) {
-			error("Can't read %d bytes from offset %d from cluster file %s\nResource ID: %d (%08X)\n", size, resOffset(id), _prj.clu[(id >> 24) - 1].label, id, id);
+			error("Can't read %d bytes from offset %d from cluster file %s\nResource ID: %d (%08X)", size, resOffset(id), _prj.clu[(id >> 24) - 1].label, id, id);
 		}
 	} else
 		_memMan->setCondition(memHandle, MEM_DONT_FREE);
@@ -282,7 +282,7 @@ void ResMan::resClose(uint32 id) {
 	if (!handle)
 		return;
 	if (!handle->refCount) {
-		warning("Resource Manager fail: unlocking object with refCount 0. Id: %d\n", id);
+		warning("Resource Manager fail: unlocking object with refCount 0. Id: %d", id);
 	} else {
 		handle->refCount--;
 		if (!handle->refCount)
diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp
index a0a990045c..df7640f80b 100644
--- a/engines/sword1/router.cpp
+++ b/engines/sword1/router.cpp
@@ -893,7 +893,7 @@ void Router::slidyWalkAnimator(WalkData *walkAnim) {
 
 
 	if (lastRealDir == 99) {
-		error("SlidyWalkAnimatorlast direction error\n");
+		error("SlidyWalkAnimatorlast direction error");
 	}
 	//****************************************************************************
 	// SLIDY
diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp
index 1ca6fdd27d..0c78798a49 100644
--- a/engines/sword1/text.cpp
+++ b/engines/sword1/text.cpp
@@ -64,7 +64,7 @@ Text::~Text(void) {
 uint32 Text::lowTextManager(uint8 *ascii, int32 width, uint8 pen) {
 	_textCount++;
 	if (_textCount > MAX_TEXT_OBS)
-		error("Text::lowTextManager: MAX_TEXT_OBS exceeded!");
+		error("Text::lowTextManager: MAX_TEXT_OBS exceeded");
 	uint32 textObjId = (TEXT_sect * ITM_PER_SEC) - 1;
 	do {
 		textObjId++;