[Scummvm-git-logs] scummvm master -> 3fd5d508eccd9a957d9e044f98874b7919a09577

mduggan noreply at scummvm.org
Mon May 25 05:28:32 UTC 2026


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

Summary:
3fd5d508ec JANITORIAL: ACCESS: resolve shadowing of function argument


Commit: 3fd5d508eccd9a957d9e044f98874b7919a09577
    https://github.com/scummvm/scummvm/commit/3fd5d508eccd9a957d9e044f98874b7919a09577
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-05-25T15:28:29+10:00

Commit Message:
JANITORIAL: ACCESS: resolve shadowing of function argument

Changed paths:
    engines/access/animation.cpp


diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
index ecbe53d6503..ceff342618a 100644
--- a/engines/access/animation.cpp
+++ b/engines/access/animation.cpp
@@ -368,10 +368,10 @@ void Animation::setFrame1(const AnimationFrame *frame, int16 xoff, int16 yoff) {
 			// now so Stiletto and Peter can have different scale factors in Noctropolis
 			ie._offsetY = (part._offsetY - frame->_baseY - part._position.y) * _scaling / 256;
 			ie._scaleOverride = _scaling;
-			const SpriteFrame *frame = ie._spritesPtr->getFrame(ie._frameNumber);
+			const SpriteFrame *spriteFrame = ie._spritesPtr->getFrame(ie._frameNumber);
 			ie._sizeOverride = Common::Point(
-				_vm->_screen->_scaleTable1[frame->w],
-				_vm->_screen->_scaleTable1[frame->h]
+				_vm->_screen->_scaleTable1[spriteFrame->w],
+				_vm->_screen->_scaleTable1[spriteFrame->h]
 			);
 		} else {
 			ie._offsetY = part._offsetY - ie._position.y;




More information about the Scummvm-git-logs mailing list