[Scummvm-git-logs] scummvm master -> 50004a2cb1bb1b1350455ed8670ad5ed26d38692

[yuv422]

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

Summary:
cc495c02e0 DARKSEED: Fixed scaling position of sprites when cop arrests Mike
50004a2cb1 DARKSEED: Fixed scaling position of sprites when Mike throws stick


Commit: cc495c02e05f0d4ac7eaa90b998f0e41e3b51523
    https://github.com/scummvm/scummvm/commit/cc495c02e05f0d4ac7eaa90b998f0e41e3b51523
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-11-23T13:46:23+11:00

Commit Message:
DARKSEED: Fixed scaling position of sprites when cop arrests Mike

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index 9981abd0a41..a164118b0b8 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -1227,7 +1227,7 @@ void DarkseedEngine::updateDisplay() { // AKA ServiceRoom
 					const Sprite &playerSprite = _player->getSprite(26);
 					_room->calculateScaledSpriteDimensions(playerSprite._width, playerSprite._height, _player->_position.y);
 					_sprites.addSpriteToDrawList(
-						_player->_position.x,
+						_player->_position.x - _scaledSpriteWidth / 2,
 						_player->_position.y - _scaledSpriteHeight,
 						&playerSprite,
 						240 - _player->_position.y,
@@ -1382,7 +1382,7 @@ void DarkseedEngine::updateDisplay() { // AKA ServiceRoom
 						_scaledSpriteWidth,
 						_scaledSpriteHeight,
 						_player->_flipSprite);
-				} else if (_animation->_otherNspAnimationType_maybe == 39) {
+				} else if (_animation->_otherNspAnimationType_maybe == 39) { // Mike arrested by cop.
 					int16 spriteX = 110;
 					int16 spriteY = _player->_position.y;
 					if (_room->_roomNumber == 10) {
@@ -1393,9 +1393,9 @@ void DarkseedEngine::updateDisplay() { // AKA ServiceRoom
 					_room->calculateScaledSpriteDimensions(
 						sprite._width,
 						sprite._height,
-						spriteX);
+						spriteY);
 					_sprites.addSpriteToDrawList(
-						spriteX,
+						spriteX - _scaledSpriteWidth / 2,
 						spriteY - _scaledSpriteHeight,
 						&sprite,
 						240 - _player->_position.y,


Commit: 50004a2cb1bb1b1350455ed8670ad5ed26d38692
    https://github.com/scummvm/scummvm/commit/50004a2cb1bb1b1350455ed8670ad5ed26d38692
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-11-23T13:46:23+11:00

Commit Message:
DARKSEED: Fixed scaling position of sprites when Mike throws stick

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index a164118b0b8..1309e9effde 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -1402,14 +1402,14 @@ void DarkseedEngine::updateDisplay() { // AKA ServiceRoom
 						_scaledSpriteWidth,
 						_scaledSpriteHeight,
 						_player->_flipSprite);
-				} else if (_animation->_otherNspAnimationType_maybe == 47) {
+				} else if (_animation->_otherNspAnimationType_maybe == 47) { // Mike stick throw
 					const Sprite &sprite = _room->_locationSprites.getSpriteAt(_player->_frameIdx);
 					_room->calculateScaledSpriteDimensions(
 						sprite._width,
 						sprite._height,
 						_player->_position.y);
 					_sprites.addSpriteToDrawList(
-						_player->_position.x,
+						_player->_position.x - _scaledSpriteWidth / 2,
 						_player->_position.y - _scaledSpriteHeight,
 						&sprite,
 						240 - _player->_position.y,