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

[AndywinXp]

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:
3e4c52be82 SCUMM: HE90: Fix sprites drawing priority


Commit: 3e4c52be828a9f3f329c13573194b0bd46d763d9
    https://github.com/scummvm/scummvm/commit/3e4c52be828a9f3f329c13573194b0bd46d763d9
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-07-15T23:11:15+02:00

Commit Message:
SCUMM: HE90: Fix sprites drawing priority

Fixes #15602:
"SCUMM/HE: BASEBALL: Strike zone border overlaps message bubbles"

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 bdcd512f1ad..656ed2cccc7 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -1654,7 +1654,7 @@ void Sprite::buildActiveSpriteList() {
 			}
 		}
 
-		if (_vm->_game.heversion > 90) {
+		if (_vm->_game.heversion > 95) {
 			_spriteTable[i].combinedPriority =  (_spriteTable[i].priority +
 				(((_spriteTable[i].group) ? _groupTable[_spriteTable[i].group].priority : 0)));
 		}
@@ -1703,12 +1703,24 @@ void Sprite::renderSprites(bool negativeOrPositiveRender) {
 		// If it reaches a positive priority it stops, because the active list
 		// should be sorted by this point...
 		if (negativeOrPositiveRender) {
-			if (spritePtr[i]->combinedPriority >= 0) {
-				break;
+			if (_vm->_game.heversion > 95) {
+				if (spritePtr[i]->combinedPriority >= 0) {
+					break;
+				}
+			} else {
+				if (spritePtr[i]->priority >= 0) {
+					break;
+				}
 			}
 		} else {
-			if (spritePtr[i]->combinedPriority < 0) {
-				continue;
+			if (_vm->_game.heversion > 95) {
+				if (spritePtr[i]->combinedPriority < 0) {
+					continue;
+				}
+			} else {
+				if (spritePtr[i]->priority < 0) {
+					continue;
+				}
 			}
 		}