[Scummvm-git-logs] scummvm master -> 81849add5b7e69fd0226b3e380aefe8dd5048937

[bluegr]

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

Summary:
d2cd79116a SKY: Remove shadowed variable declarations
5d4305e526 SKY: Fix potentially uninitialized variables
81849add5b SKY: Fix const correctness in loadAnim()


Commit: d2cd79116a8158bc36e75b58d91a77cc995d1327
    https://github.com/scummvm/scummvm/commit/d2cd79116a8158bc36e75b58d91a77cc995d1327
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-01T07:57:17+03:00

Commit Message:
SKY: Remove shadowed variable declarations

Changed paths:
    engines/sky/screen.cpp


diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index a34f62227f1..71e7e7308d1 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -197,7 +197,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 	_seqInfo.seqData = _seqInfo.seqDataPos = NULL;
 	_seqInfo.running = false;
 
-	for (int i = 0; i < NUM_UI_ICONS; i++) {
+	for (i = 0; i < NUM_UI_ICONS; i++) {
 		_uiIcon[i]._visible = false;
 		_uiIcon[i]._anim = nullptr;
 		_uiIcon[i]._x = 0;
@@ -205,7 +205,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 		_uiIcon[i]._alpha = 0.0f;
 	}
 
-	for (int i = 0; i < NUM_PROXIMITY_ICONS; i++) {
+	for (i = 0; i < NUM_PROXIMITY_ICONS; i++) {
 		_proximityIcon[i]._visible = false;
 		_proximityIcon[i]._anim = nullptr;
 		_proximityIcon[i]._x = 0;
@@ -213,7 +213,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 		_proximityIcon[i]._alpha = 0.0f;
 	}
 
-	for (int i = 0; i < NUM_INV_ICONS; i++) {
+	for (i = 0; i < NUM_INV_ICONS; i++) {
 		_invIcon[i]._visible = false;
 		_invIcon[i]._anim = nullptr;
 		_invIcon[i]._x = 0;
@@ -221,7 +221,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 		_invIcon[i]._alpha = 0.0f;
 	}
 
-	for (int i = 0; i < NUM_INV_ANIMS; i++) {
+	for (i = 0; i < NUM_INV_ANIMS; i++) {
 		char invTexFile[64];
 		Common::sprintf_s(invTexFile, "%d.tex", invIconId[i]);
 


Commit: 5d4305e526ab47a976873f468d4ca3be254f2238
    https://github.com/scummvm/scummvm/commit/5d4305e526ab47a976873f468d4ca3be254f2238
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-01T08:00:13+03:00

Commit Message:
SKY: Fix potentially uninitialized variables

Changed paths:
    engines/sky/mouse.cpp


diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp
index 5403964afb7..4a99053b51b 100644
--- a/engines/sky/mouse.cpp
+++ b/engines/sky/mouse.cpp
@@ -911,7 +911,7 @@ void Mouse::pointerEngine(uint16 xPos, uint16 yPos) {
 }
 
 void Mouse::pointerEngineIBASS(uint16 xPos, uint16 yPos) {
-	int midx, midy; // open hotspot dimensions
+	int midx = 0, midy = 0; // open hotspot dimensions
 	Compact *itemData;
 	int itemProx;
 	int d = 0;
@@ -1425,7 +1425,7 @@ bool Mouse::wasClicked() {
 void Mouse::lincInvMouse(uint16 xPos, uint16 yPos) {
 	uint32 *objList;
 	int j, num;
-	Compact *itemData;
+	Compact *itemData = nullptr;
 	bool touched = false;
 	bool buttonHeld = (_system->getEventManager()->getButtonState() != 0); // mouseEngine() consumes the click at the end so using _mouseB would increment the timer at each click not on hold
 
@@ -1652,7 +1652,7 @@ void Mouse::lincInvMouse(uint16 xPos, uint16 yPos) {
 
 void Mouse::invMouse(uint16 xPos, uint16 yPos) {
 	uint32 *objList;
-	Compact *itemData;
+	Compact *itemData = nullptr;
 	int j, num;
 	bool touched = false;
 


Commit: 81849add5b7e69fd0226b3e380aefe8dd5048937
    https://github.com/scummvm/scummvm/commit/81849add5b7e69fd0226b3e380aefe8dd5048937
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-01T08:09:41+03:00

Commit Message:
SKY: Fix const correctness in loadAnim()

Changed paths:
    engines/sky/disk.cpp
    engines/sky/disk.h


diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp
index 117333ddbd8..70586ec7662 100644
--- a/engines/sky/disk.cpp
+++ b/engines/sky/disk.cpp
@@ -111,7 +111,7 @@ Disk::~Disk() {
 	_entry = 0;
 }
 
-Animation *Disk::loadAnim(const char *filename, const Graphics::PixelFormat &targetFormat) {
+Animation *Disk::loadAnim(const char *filename, Graphics::PixelFormat &targetFormat) {
 	Common::File fp;
 
 	if (!fp.open(filename))
diff --git a/engines/sky/disk.h b/engines/sky/disk.h
index fdf927ee14c..4bf19e60484 100644
--- a/engines/sky/disk.h
+++ b/engines/sky/disk.h
@@ -76,7 +76,7 @@ public:
 	void fnFlushBuffers();
 	uint32 *giveLoadedFilesList() { return _loadedFilesList; }
 	void refreshFilesList(uint32 *list);
-	Animation *loadAnim(const char *filename, const Graphics::PixelFormat &targetFormat);
+	Animation *loadAnim(const char *filename, Graphics::PixelFormat &targetFormat);
 
 protected:
 	uint8 *getFileInfo(uint16 fileNr);