[Scummvm-git-logs] scummvm master -> 9fb00a9d6b95839756eba4be30f16416d60dc0d1

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9fb00a9d6b ULTIMA8: Remove extra CRs in debug messages


Commit: 9fb00a9d6b95839756eba4be30f16416d60dc0d1
    https://github.com/scummvm/scummvm/commit/9fb00a9d6b95839756eba4be30f16416d60dc0d1
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-11-19T10:20:33+11:00

Commit Message:
ULTIMA8: Remove extra CRs in debug messages

Changed paths:
    engines/ultima/ultima8/misc/debugger.cpp


diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index 819f78560b4..ec24c0b0d37 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -1052,7 +1052,7 @@ bool Debugger::cmdName(int argc, const char **argv) {
 
 bool Debugger::cmdUseBackpack(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't use backpack: avatarInStasis\n");
+		debugPrintf("Can't use backpack: avatarInStasis");
 		return false;
 	}
 	MainActor *av = getMainActor();
@@ -1069,7 +1069,7 @@ static bool _isAvatarControlled() {
 
 bool Debugger::cmdNextInventory(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't use inventory: avatarInStasis\n");
+		debugPrintf("Can't use inventory: avatarInStasis");
 		return false;
 	}
 
@@ -1085,7 +1085,7 @@ bool Debugger::cmdNextInventory(int argc, const char **argv) {
 
 bool Debugger::cmdNextWeapon(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't change weapon: avatarInStasis\n");
+		debugPrintf("Can't change weapon: avatarInStasis");
 		return false;
 	}
 
@@ -1101,7 +1101,7 @@ bool Debugger::cmdNextWeapon(int argc, const char **argv) {
 
 bool Debugger::cmdUseInventoryItem(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't use active inventory item: avatarInStasis\n");
+		debugPrintf("Can't use active inventory item: avatarInStasis");
 		return false;
 	}
 
@@ -1123,7 +1123,7 @@ bool Debugger::cmdUseInventoryItem(int argc, const char **argv) {
 
 bool Debugger::cmdUseMedikit(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't use medikit: avatarInStasis\n");
+		debugPrintf("Can't use medikit: avatarInStasis");
 		return false;
 	}
 
@@ -1139,7 +1139,7 @@ bool Debugger::cmdUseMedikit(int argc, const char **argv) {
 
 bool Debugger::cmdUseEnergyCube(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't use energy cube: avatarInStasis\n");
+		debugPrintf("Can't use energy cube: avatarInStasis");
 		return false;
 	}
 
@@ -1155,7 +1155,7 @@ bool Debugger::cmdUseEnergyCube(int argc, const char **argv) {
 
 bool Debugger::cmdDetonateBomb(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't detonate bomb: avatarInStasis\n");
+		debugPrintf("Can't detonate bomb: avatarInStasis");
 		return false;
 	}
 
@@ -1171,7 +1171,7 @@ bool Debugger::cmdDetonateBomb(int argc, const char **argv) {
 
 bool Debugger::cmdDropWeapon(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't drop weapon: avatarInStasis\n");
+		debugPrintf("Can't drop weapon: avatarInStasis");
 		return false;
 	}
 
@@ -1187,7 +1187,7 @@ bool Debugger::cmdDropWeapon(int argc, const char **argv) {
 
 bool Debugger::cmdUseInventory(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't use inventory: avatarInStasis\n");
+		debugPrintf("Can't use inventory: avatarInStasis");
 		return false;
 	}
 	MainActor *av = getMainActor();
@@ -1222,7 +1222,7 @@ bool Debugger::cmdUseKeyring(int argc, const char **argv) {
 
 bool Debugger::cmdCameraOnAvatar(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isCruStasis()) {
-		debugPrintf("Can't move camera: cruStasis\n");
+		debugPrintf("Can't move camera: cruStasis");
 		return false;
 	}
 	Actor *actor = getControlledActor();
@@ -1239,7 +1239,7 @@ static bool _avatarMoveKey(uint32 flag, const char *debugname) {
 	Ultima8Engine *engine = Ultima8Engine::get_instance();
 	engine->moveKeyEvent();
 	if (engine->isAvatarInStasis()) {
-		debug("Can't %s: avatarInStasis\n", debugname);
+		debug("Can't %s: avatarInStasis", debugname);
 		return false;
 	}
 	AvatarMoverProcess *proc = engine->getAvatarMoverProcess();
@@ -1392,7 +1392,7 @@ bool Debugger::cmdToggleCrouch(int argc, const char **argv) {
 
 bool Debugger::cmdToggleCombat(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't toggle combat: avatarInStasis\n");
+		debugPrintf("Can't toggle combat: avatarInStasis");
 		return false;
 	}
 
@@ -1403,7 +1403,7 @@ bool Debugger::cmdToggleCombat(int argc, const char **argv) {
 
 bool Debugger::cmdStartSelection(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't select items: avatarInStasis\n");
+		debugPrintf("Can't select items: avatarInStasis");
 		return false;
 	}
 
@@ -1423,7 +1423,7 @@ bool Debugger::cmdStartSelection(int argc, const char **argv) {
 
 bool Debugger::cmdUseSelection(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't use items: avatarInStasis\n");
+		debugPrintf("Can't use items: avatarInStasis");
 		return false;
 	}
 
@@ -1440,7 +1440,7 @@ bool Debugger::cmdUseSelection(int argc, const char **argv) {
 
 bool Debugger::cmdGrabItems(int argc, const char **argv) {
 	if (Ultima8Engine::get_instance()->isAvatarInStasis()) {
-		debugPrintf("Can't grab items: avatarInStasis\n");
+		debugPrintf("Can't grab items: avatarInStasis");
 		return false;
 	}
 
@@ -1493,11 +1493,11 @@ bool Debugger::cmdObjectInfo(int argc, const char **argv) {
 static bool _quickMoveKey(uint32 flag, const char *debugname) {
 	Ultima8Engine *engine = Ultima8Engine::get_instance();
 	if (engine->isAvatarInStasis()) {
-		g_debugger->debugPrintf("Can't %s: avatarInStasis\n", debugname);
+		g_debugger->debugPrintf("Can't %s: avatarInStasis", debugname);
 		return true;
 	}
 	if (!engine->areCheatsEnabled()) {
-		g_debugger->debugPrintf("Can't %s: Cheats aren't enabled\n", debugname);
+		g_debugger->debugPrintf("Can't %s: Cheats aren't enabled", debugname);
 		return true;
 	}