[Scummvm-git-logs] scummvm master -> 1b18faa5c51970a1ae7b97b65f05684c25334fb7

[yuv422]

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

Summary:
1abd39347b DARKSEED: Show console while running bed wake sequence
77fb10386b DARKSEED: Fix bug where player moves when loading a new room
1b18faa5c5 DARKSEED: Confirm quit from menu with left mouse click.


Commit: 1abd39347bdb8d915a222bc5be7e91ad05d4ff91
    https://github.com/scummvm/scummvm/commit/1abd39347bdb8d915a222bc5be7e91ad05d4ff91
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-11-23T11:07:12+11:00

Commit Message:
DARKSEED: Show console while running bed wake sequence

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index ff7219eaaa0..9981abd0a41 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -2558,7 +2558,7 @@ void DarkseedEngine::doCircles() {
 
 	_frame.draw();
 	_room->draw();
-	_console->draw();
+	_console->draw(true);
 
 	// setup & draw Mike in bed.
 	_sprites.clearSpriteDrawList();
@@ -2627,7 +2627,7 @@ void DarkseedEngine::restartGame() {
 }
 
 void DarkseedEngine::newGame() {
-	_redrawFrame = true;
+	_redrawFrame = false;
 	_sprites.clearSpriteDrawList();
 	removeFullscreenPic();
 	_inventory.reset();


Commit: 77fb10386bfa758ad9a6815b56be94f09602daa7
    https://github.com/scummvm/scummvm/commit/77fb10386bfa758ad9a6815b56be94f09602daa7
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-11-23T11:07:12+11:00

Commit Message:
DARKSEED: Fix bug where player moves when loading a new room

Changed paths:
    engines/darkseed/room.cpp


diff --git a/engines/darkseed/room.cpp b/engines/darkseed/room.cpp
index 8e8299aaf9f..2e36cb336bd 100644
--- a/engines/darkseed/room.cpp
+++ b/engines/darkseed/room.cpp
@@ -246,6 +246,14 @@ bool Room::load() {
 
 	loadLocationSprites(Common::Path(Common::String::format("%s.nsp", filenameBase.c_str())));
 
+	g_engine->_player->_frameIdx = 0;
+	if (g_engine->_player->_position.y > 239) {
+		g_engine->_player->_position.y = 239;
+	}
+	g_engine->_player->_walkTarget = g_engine->_player->_position;
+	g_engine->_player->_heroMoving = false;
+	g_engine->_player->_playerIsChangingDirection = false;
+
 	if (_roomNumber == 61 && g_engine->_objectVar[22] > 2) {
 		loadRoom61AWalkableLocations();
 	}


Commit: 1b18faa5c51970a1ae7b97b65f05684c25334fb7
    https://github.com/scummvm/scummvm/commit/1b18faa5c51970a1ae7b97b65f05684c25334fb7
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-11-23T11:07:12+11:00

Commit Message:
DARKSEED: Confirm quit from menu with left mouse click.

Changed paths:
    engines/darkseed/menu.cpp


diff --git a/engines/darkseed/menu.cpp b/engines/darkseed/menu.cpp
index a67db4af150..e022575cf25 100644
--- a/engines/darkseed/menu.cpp
+++ b/engines/darkseed/menu.cpp
@@ -113,7 +113,7 @@ void loadMenu() {
 			g_engine->_lastKeyPressed = Common::KeyCode::KEYCODE_INVALID;
 			while (!g_engine->shouldQuit()) {
 				g_engine->updateEvents();
-				if (g_engine->_lastKeyPressed == Common::KeyCode::KEYCODE_y) {
+				if (g_engine->_lastKeyPressed == Common::KeyCode::KEYCODE_y || g_engine->_isLeftMouseClicked) {
 					g_engine->quitGame();
 					break;
 				}