[Scummvm-git-logs] scummvm master -> 4b182dad46ca9fbbfbea8f43b1f4ac461b43fc69

[digitall]

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

Summary:
35fbf3f913 TRECISION: Fix warning unused-variable
e4d1903474 TITANIC: Fix warning sign-compare
4b182dad46 QUEEN: Fix warning format-truncation


Commit: 35fbf3f913304223431162f2d7682c5d299c9013
    https://github.com/scummvm/scummvm/commit/35fbf3f913304223431162f2d7682c5d299c9013
Author: Mathias Parnaudeau (mparnaudeau at optimum-software.fr)
Date: 2021-07-08T21:57:48+01:00

Commit Message:
TRECISION: Fix warning unused-variable

Changed paths:
    engines/trecision/anim.cpp


diff --git a/engines/trecision/anim.cpp b/engines/trecision/anim.cpp
index f3246c9c5e..d409af6ee5 100644
--- a/engines/trecision/anim.cpp
+++ b/engines/trecision/anim.cpp
@@ -357,8 +357,6 @@ void AnimTypeManager::handler(int type) {
 	if (h->_curFrame <= h->_lastFrame)
 		return;
 
-	const uint16 flag = _vm->_animMgr->_animTab[_vm->_room[_vm->_curRoom]._bkgAnim]._flag;
-
 	for (int32 i = 0; i < MAXATFRAME; ++i) {
 		// if it's time to run this AtFrame
 		if (anim->_atFrame[i]._numFrame > h->_lastFrame &&


Commit: e4d1903474daa82b6048402353434e6adec52ef4
    https://github.com/scummvm/scummvm/commit/e4d1903474daa82b6048402353434e6adec52ef4
Author: Mathias Parnaudeau (mparnaudeau at optimum-software.fr)
Date: 2021-07-08T21:57:48+01:00

Commit Message:
TITANIC: Fix warning sign-compare

Changed paths:
    engines/titanic/support/avi_surface.cpp


diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index ff439abe25..592c2de780 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -328,11 +328,11 @@ void AVISurface::copyMovieFrame(const Graphics::Surface &src, Graphics::ManagedS
 		assert(src.format.bytesPerPixel == 4 && dest.format.bytesPerPixel == 2);
 		uint16 transPixel = _videoSurface->getTransparencyColor();
 
-		for (uint y = 0; y < MIN(src.h, dest.h); ++y) {
+		for (int y = 0; y < MIN(src.h, dest.h); ++y) {
 			const uint32 *pSrc = (const uint32 *)src.getBasePtr(0, y);
 			uint16 *pDest = (uint16 *)dest.getBasePtr(0, y);
 
-			for (uint x = 0; x < MIN(src.w, dest.w); ++x, ++pSrc, ++pDest) {
+			for (int x = 0; x < MIN(src.w, dest.w); ++x, ++pSrc, ++pDest) {
 				src.format.colorToARGB(*pSrc, a, r, g, b);
 				assert(a == 0 || a == 0xff);
 


Commit: 4b182dad46ca9fbbfbea8f43b1f4ac461b43fc69
    https://github.com/scummvm/scummvm/commit/4b182dad46ca9fbbfbea8f43b1f4ac461b43fc69
Author: Mathias Parnaudeau (mparnaudeau at optimum-software.fr)
Date: 2021-07-08T21:57:48+01:00

Commit Message:
QUEEN: Fix warning format-truncation

Changed paths:
    engines/queen/command.cpp


diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp
index affd10723d..8a042e8c8b 100644
--- a/engines/queen/command.cpp
+++ b/engines/queen/command.cpp
@@ -60,8 +60,8 @@ void CmdText::displayTemp(InkColor color, Verb v) {
 }
 
 void CmdText::displayTemp(InkColor color, const char *name, bool outlined) {
-	char temp[MAX_COMMAND_LEN];
-	snprintf(temp, MAX_COMMAND_LEN, "%s %s", _command, name);
+	char temp[MAX_COMMAND_LEN + 2];
+	snprintf(temp, MAX_COMMAND_LEN + 1, "%s %s", _command, name);
 	display(color, temp, outlined);
 }
 
@@ -85,9 +85,9 @@ public:
 	CmdTextHebrew(uint8 y, QueenEngine *vm) : CmdText(y, vm) {}
 
 	void displayTemp(InkColor color, const char *name, bool outlined) override {
-		char temp[MAX_COMMAND_LEN];
+		char temp[MAX_COMMAND_LEN + 2];
 
-		snprintf(temp, MAX_COMMAND_LEN, "%s %s", name, _command);
+		snprintf(temp, MAX_COMMAND_LEN + 1, "%s %s", name, _command);
 		display(color, temp, outlined);
 	}
 
@@ -116,12 +116,12 @@ public:
 	CmdTextGreek(uint8 y, QueenEngine *vm) : CmdText(y, vm) {}
 
 	void displayTemp(InkColor color, const char *name, bool outlined) override {
-		char temp[MAX_COMMAND_LEN];
+		char temp[MAX_COMMAND_LEN + 2];
 		// don't show a space after the goto and give commands in the Greek version
 		if (_command[1] != (char)-34 && !(_command[1] == (char)-2 && strlen(_command) > 5))
-			snprintf(temp, MAX_COMMAND_LEN, "%s %s", _command, name);
+			snprintf(temp, MAX_COMMAND_LEN + 1, "%s %s", _command, name);
 		else
-			snprintf(temp, MAX_COMMAND_LEN, "%s%s", _command, name);
+			snprintf(temp, MAX_COMMAND_LEN + 1, "%s%s", _command, name);
 		display(color, temp, outlined);
 	}