[Scummvm-git-logs] scummvm master -> 22bf898a7941d16e9af205c9dc401504efe928d9

AndywinXp noreply at scummvm.org
Sun Sep 28 20:52:47 UTC 2025


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:
22bf898a79 JANITORIAL: SCUMM: HE: use const_cast


Commit: 22bf898a7941d16e9af205c9dc401504efe928d9
    https://github.com/scummvm/scummvm/commit/22bf898a7941d16e9af205c9dc401504efe928d9
Author: Michael (michael_kuerbis at web.de)
Date: 2025-09-28T22:52:43+02:00

Commit Message:
JANITORIAL: SCUMM: HE: use const_cast

Changed paths:
    engines/scumm/he/sprite_he.cpp


diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index 4949ef3daaf..0201642f5f2 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -1674,11 +1674,11 @@ recurse:
 		for (;;) {
 			do {
 				++loguy;
-			} while (loguy <= hi && compareSpriteCombinedPriority((const SpriteInfo **)loguy, (const SpriteInfo **)lo) <= 0);
+			} while (loguy <= hi && compareSpriteCombinedPriority(const_cast<SpriteInfo **>(loguy), const_cast<SpriteInfo **>(lo)) <= 0);
 
 			do {
 				--higuy;
-			} while (higuy > lo && compareSpriteCombinedPriority((const SpriteInfo **)higuy, (const SpriteInfo **)lo) >= 0);
+			} while (higuy > lo && compareSpriteCombinedPriority(const_cast<SpriteInfo **>(higuy), const_cast<SpriteInfo **>(lo)) >= 0);
 
 			if (higuy < loguy)
 				break;
@@ -1731,7 +1731,7 @@ void Sprite::shortsortSpriteArray(SpriteInfo **lo, SpriteInfo **hi) {
 		max = lo;
 
 		for (p = lo + 1; p <= hi; p++) {
-			if (compareSpriteCombinedPriority((const SpriteInfo **)p, (const SpriteInfo **)max) > 0) {
+			if (compareSpriteCombinedPriority(const_cast<SpriteInfo **>(p), const_cast<SpriteInfo **>(max)) > 0) {
 				max = p;
 			}
 		}




More information about the Scummvm-git-logs mailing list