[Scummvm-git-logs] scummvm master -> b5aff5ba56066842945afc57436fe631f669b237
yuv422
noreply at scummvm.org
Fri Oct 3 11:42:21 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:
b5aff5ba56 DARKSEED: Fix bug with end-of-day transition while outside.
Commit: b5aff5ba56066842945afc57436fe631f669b237
https://github.com/scummvm/scummvm/commit/b5aff5ba56066842945afc57436fe631f669b237
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-10-03T21:41:10+10:00
Commit Message:
DARKSEED: Fix bug with end-of-day transition while outside.
Changed paths:
engines/darkseed/darkseed.cpp
diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index bca23dca96a..abca3ac0541 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -2639,21 +2639,28 @@ void DarkseedEngine::doCircles() {
updateDisplay();
_sprites.drawSprites();
} else {
- _player->loadAnimations("bedsleep.nsp");
- _player->_position.x = 0x87;
- _player->_position.y = 0x5b;
- _player->_frameIdx = 0;
- _player->_direction = 1;
- _animation->setupOtherNspAnimation(0, 1);
+ if (_room->_roomNumber == 0) {
+ _player->loadAnimations("bedsleep.nsp");
+ _player->_position.x = 0x87;
+ _player->_position.y = 0x5b;
+ _player->_frameIdx = 0;
+ _player->_direction = 1;
+ _animation->setupOtherNspAnimation(0, 1);
+ } else {
+ _player->_direction = 0;
+ updateDisplay();
+ }
_frame.draw();
_room->draw();
_console->draw(true);
- // setup & draw Mike in bed.
- _sprites.clearSpriteDrawList();
- const Sprite &animSprite = _player->_animations.getSpriteAt(_player->_frameIdx);
- _sprites.addSpriteToDrawList(0x75, 0x71, &animSprite, 240 - _player->_position.y, animSprite._width, animSprite._height, _player->_flipSprite);
+ if (_room->_roomNumber == 0) {
+ // setup & draw Mike in bed.
+ _sprites.clearSpriteDrawList();
+ const Sprite &animSprite = _player->_animations.getSpriteAt(_player->_frameIdx);
+ _sprites.addSpriteToDrawList(0x75, 0x71, &animSprite, 240 - _player->_position.y, animSprite._width, animSprite._height, _player->_flipSprite);
+ }
_sprites.drawSprites();
}
More information about the Scummvm-git-logs
mailing list