[Scummvm-git-logs] scummvm master -> 200b3004cff35cae0555533fa0b3e0f4ad04b4b5

digitall noreply at scummvm.org
Wed Dec 18 01:05:17 UTC 2024


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:
200b3004cf SCI: Fix GCC Compiler Shadowing Warnings


Commit: 200b3004cff35cae0555533fa0b3e0f4ad04b4b5
    https://github.com/scummvm/scummvm/commit/200b3004cff35cae0555533fa0b3e0f4ad04b4b5
Author: D G Turner (digitall at scummvm.org)
Date: 2024-12-18T01:04:20Z

Commit Message:
SCI: Fix GCC Compiler Shadowing Warnings

Changed paths:
    engines/sci/graphics/paint16.cpp


diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 1a3b101ed19..6958250a680 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -56,8 +56,8 @@ GfxPaint16::GfxPaint16(ResourceManager *resMan, SegManager *segMan, GfxCache *ca
 
 // The original KQ6WinCD interpreter saves the hires drawing information in a linked list. This is used to redraw the hires cels after disposing a window.
 struct HiresDrawData {
-	HiresDrawData(HiresDrawData *chain, reg_t hiresHandle, GuiResourceId id, int16 loop, int16 cel, uint16 left, uint16 top, uint16 pal, byte prio, bool needsWorkaround)
-		: handle(hiresHandle), viewId(id), lpNo(loop), celNo(cel), leftPos(left), topPos(top), palNo(pal), prio(prio), waFlag(needsWorkaround), prev(nullptr), next(chain) {
+	HiresDrawData(HiresDrawData *chain, reg_t hiresHandle, GuiResourceId id, int16 loop, int16 cel, uint16 left, uint16 top, uint16 pal, byte priority, bool needsWorkaround)
+		: handle(hiresHandle), viewId(id), lpNo(loop), celNo(cel), leftPos(left), topPos(top), palNo(pal), prio(priority), waFlag(needsWorkaround), prev(nullptr), next(chain) {
 		if (chain)
 			chain->prev = this;
 	}




More information about the Scummvm-git-logs mailing list