[Scummvm-git-logs] scummvm master -> 82fe4ec9f1c03ca96d34447afe95f1cac520d017

[digitall]

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:
82fe4ec9f1 QDENGINE: Fix Some GCC Compiler Warnings


Commit: 82fe4ec9f1c03ca96d34447afe95f1cac520d017
    https://github.com/scummvm/scummvm/commit/82fe4ec9f1c03ca96d34447afe95f1cac520d017
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-13T00:05:54Z

Commit Message:
QDENGINE: Fix Some GCC Compiler Warnings

Changed paths:
    engines/qdengine/minigames/kartiny.h
    engines/qdengine/qdcore/qd_sprite.cpp


diff --git a/engines/qdengine/minigames/kartiny.h b/engines/qdengine/minigames/kartiny.h
index 3af77ada1eb..3cb5cbcfcb2 100644
--- a/engines/qdengine/minigames/kartiny.h
+++ b/engines/qdengine/minigames/kartiny.h
@@ -368,8 +368,9 @@ private:
 			maxCoords = 279;
 		else if (obj == _bg2_l2Obj)
 			maxCoords = 267;
-		else if (obj == _bg3_l2Obj)
-			maxCoords = 258;
+		// FIXME: Remove this as covered by the default case?
+		//else if (obj == _bg3_l2Obj)
+		//	maxCoords = 258;
 		else
 			maxCoords = 258;
 
diff --git a/engines/qdengine/qdcore/qd_sprite.cpp b/engines/qdengine/qdcore/qd_sprite.cpp
index eb45aa5171a..b32e72f06b0 100644
--- a/engines/qdengine/qdcore/qd_sprite.cpp
+++ b/engines/qdengine/qdcore/qd_sprite.cpp
@@ -124,7 +124,7 @@ qdSprite::qdSprite(int wid, int hei, int format):
 	_data = new byte[wid * hei * bytes_per_pix];
 }
 
-qdSprite::qdSprite(const qdSprite &spr) : _data(0),
+qdSprite::qdSprite(const qdSprite &spr) : qdResource(spr), _data(0),
 	_rle_data(0),
 	_flags(0) {
 	*this = spr;