[Scummvm-git-logs] scummvm master -> 15f1f86bfe46ea4d6e1d3e94f107b8e55f4b5a7a

[aquadran]

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:
15f1f86bfe GRIM: Remove end lines from warning() messages


Commit: 15f1f86bfe46ea4d6e1d3e94f107b8e55f4b5a7a
    https://github.com/scummvm/scummvm/commit/15f1f86bfe46ea4d6e1d3e94f107b8e55f4b5a7a
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-11-12T10:51:13+01:00

Commit Message:
GRIM: Remove end lines from warning() messages

Changed paths:
    engines/grim/bitmap.cpp
    engines/grim/movie/codecs/codec48.cpp
    engines/grim/movie/smush.cpp


diff --git a/engines/grim/bitmap.cpp b/engines/grim/bitmap.cpp
index 4e038b58ae..835b638587 100644
--- a/engines/grim/bitmap.cpp
+++ b/engines/grim/bitmap.cpp
@@ -153,7 +153,7 @@ bool BitmapData::loadGrimBm(Common::SeekableReadStream *data) {
 			bool success = decompress_codec3(compressed, (char *)_data[i].getRawBuffer(), _bpp / 8 * _width * _height);
 			delete[] compressed;
 			if (!success)
-				warning(".. when loading image %s.\n", _fname.c_str());
+				warning(".. when loading image %s.", _fname.c_str());
 		} else
 			Debug::error(Debug::Bitmaps, "Unknown image codec in BitmapData ctor!");
 
diff --git a/engines/grim/movie/codecs/codec48.cpp b/engines/grim/movie/codecs/codec48.cpp
index 6ac10b2f6d..7e064caa23 100644
--- a/engines/grim/movie/codecs/codec48.cpp
+++ b/engines/grim/movie/codecs/codec48.cpp
@@ -120,10 +120,10 @@ bool Codec48Decoder::decode(byte *dst, const byte *src) {
 		break;
 	case 5:
 		// Some other encoding, but it's unused. (Good)
-		warning("SmushDecoder::decode() codec 48 frame type 5 encountered! Please report!\n");
+		warning("SmushDecoder::decode() codec 48 frame type 5 encountered! Please report!");
 		break;
 	default:
-		warning("SmushDecoder::decode() Unknown codec 48 frame type %d\n", src[0]);
+		warning("SmushDecoder::decode() Unknown codec 48 frame type %d", src[0]);
 		break;
 	}
 
diff --git a/engines/grim/movie/smush.cpp b/engines/grim/movie/smush.cpp
index 25a5349a1d..6f4ffb1412 100644
--- a/engines/grim/movie/smush.cpp
+++ b/engines/grim/movie/smush.cpp
@@ -51,7 +51,7 @@ SmushPlayer::SmushPlayer(bool demo) : MoviePlayer(), _demo(demo) {
 }
 
 bool SmushPlayer::loadFile(const Common::String &filename) {
-	warning("Play video %s\n", filename.c_str());
+	warning("Play video %s", filename.c_str());
 	bool success = false;
 	_videoDecoder = _smushDecoder;
 	if (!_demo)