[Scummvm-git-logs] scummvm master -> 6d1079270318bbba43fd2f30e64c4fabdc4bf4a0

[yuv422]

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

Summary:
dad86e7677 DARKSEED: Fix bug when talking to Sargo for a second time.
6d10792703 DARKSEED: Improve the hitbox when picking up gloves.


Commit: dad86e7677f721d6f21f1446a0f9a2c8cfae9681
    https://github.com/scummvm/scummvm/commit/dad86e7677f721d6f21f1446a0f9a2c8cfae9681
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-10-04T13:31:15+10:00

Commit Message:
DARKSEED: Fix bug when talking to Sargo for a second time.

Changed paths:
    engines/darkseed/animation.cpp
    engines/darkseed/sound.cpp
    engines/darkseed/sound.h


diff --git a/engines/darkseed/animation.cpp b/engines/darkseed/animation.cpp
index 7ba9fec36e3..8ac669adad7 100644
--- a/engines/darkseed/animation.cpp
+++ b/engines/darkseed/animation.cpp
@@ -962,6 +962,10 @@ void Animation::sargoAnim() {
 	_animIndexTbl[0] = 0;
 	_spriteAnimCountdownTimer[0] = _player->_animations.getAnimAt(0)._frameDuration[0];
 
+	// always play Sargo speech
+	g_engine->_sound->resetIndividualSpeech(916);
+	g_engine->_sound->resetIndividualSpeech(917);
+
 	g_engine->_console->printTosText(916);
 
 	uint8 dialogIdx = 79;
diff --git a/engines/darkseed/sound.cpp b/engines/darkseed/sound.cpp
index 6773ae08206..221439bab84 100644
--- a/engines/darkseed/sound.cpp
+++ b/engines/darkseed/sound.cpp
@@ -580,5 +580,8 @@ bool Sound::isUsingCdSfx() const {
 bool Sound::isUsingFloppySfx() const {
 	return _useFloppySfx;
 }
+void Sound::resetIndividualSpeech(int tosIdx) {
+	_didSpeech[tosIdx] = 0;
+}
 
 } // End of namespace Darkseed
diff --git a/engines/darkseed/sound.h b/engines/darkseed/sound.h
index aa340358608..17448b9455d 100644
--- a/engines/darkseed/sound.h
+++ b/engines/darkseed/sound.h
@@ -87,6 +87,7 @@ public:
 	bool isPlayingSfx(uint8 sfxId) const;
 	bool isPlayingMusic();
 	void resetSpeech();
+	void resetIndividualSpeech(int tosIdx);
 	void playMusic(MusicId musicId, bool loop = true);
 	void playMusic(StartMusicId musicId);
 	void playMusic(Common::String const &filename, Common::String const *instrBankFilename = nullptr, uint8 priority = 0xFF, bool loop = false);


Commit: 6d1079270318bbba43fd2f30e64c4fabdc4bf4a0
    https://github.com/scummvm/scummvm/commit/6d1079270318bbba43fd2f30e64c4fabdc4bf4a0
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-10-04T13:31:15+10:00

Commit Message:
DARKSEED: Improve the hitbox when picking up gloves.

Changed paths:
    engines/darkseed/room.cpp


diff --git a/engines/darkseed/room.cpp b/engines/darkseed/room.cpp
index 2d332a803fc..3357c96cdb1 100644
--- a/engines/darkseed/room.cpp
+++ b/engines/darkseed/room.cpp
@@ -243,6 +243,11 @@ bool Room::load() {
 		if (roomObj.objNum == 41 && roomObj.type == 0) { // TODO hack. figure out why the tincup doesn't show in the jail cell normally.
 			roomObj.type = 1;
 		}
+		if (roomObj.objNum == 14 && _roomNumber == 34) { // TODO HACK. Figure out why we need to resize the hitbox for the gloves.
+			// originally it is 20x12 pixels not sure why.
+			roomObj.width = 52;
+			roomObj.height = 22;
+		}
 	}
 
 	_pal.load(g_engine->getPictureFilePath(Common::Path(Common::String::format("%s.pal", filenameBase.c_str()))), false);
@@ -374,7 +379,7 @@ int Room::checkCursorAndMoveableObjects() {
 			}
 
 			if (_roomObj[i].objNum == 14 && g_engine->_cursor.getY() > 40 && g_engine->_objectVar.getVar(86) == 0) {
-				hasObject = false;
+				hasObject = false; // don't return gloves if the glovebox is closed.
 			}
 
 			if (hasObject) {