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

[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:
b7ccf3dab7 DARKSEED: Fix for #15831 Restore mouse pointer after ship leaves at end of game.
3e40fcc264 DARKSEED: Improve reset game state. Clear console when starting a new game.


Commit: b7ccf3dab7a1ba00e7f8e4d4e43d63afb2a93d8a
    https://github.com/scummvm/scummvm/commit/b7ccf3dab7a1ba00e7f8e4d4e43d63afb2a93d8a
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-03-27T21:50:14+11:00

Commit Message:
DARKSEED: Fix for #15831 Restore mouse pointer after ship leaves at end of game.

Changed paths:
    engines/darkseed/cutscene.cpp


diff --git a/engines/darkseed/cutscene.cpp b/engines/darkseed/cutscene.cpp
index 986055974a1..b7cc0fdfc50 100644
--- a/engines/darkseed/cutscene.cpp
+++ b/engines/darkseed/cutscene.cpp
@@ -82,6 +82,7 @@ void Cutscene::update() {
 		if (_cutsceneId == 'E') {
 			g_engine->_previousRoomNumber = 38;
 			g_engine->changeToRoom(7);
+			g_engine->_cursor.showCursor(true);
 		} else if (_cutsceneId == 'Z') {
 			if (g_engine->isDosDemo()) {
 				g_engine->quitGame();


Commit: 3e40fcc264afff3ee235305de654150cdc681b2a
    https://github.com/scummvm/scummvm/commit/3e40fcc264afff3ee235305de654150cdc681b2a
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-03-27T21:50:14+11:00

Commit Message:
DARKSEED: Improve reset game state. Clear console when starting a new game.

Changed paths:
    engines/darkseed/console.cpp
    engines/darkseed/console.h
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/console.cpp b/engines/darkseed/console.cpp
index 91687eb343c..7aad11bbcf5 100644
--- a/engines/darkseed/console.cpp
+++ b/engines/darkseed/console.cpp
@@ -57,6 +57,13 @@ Console::~Console() {
 	delete _font;
 }
 
+void Console::clear() {
+	_text.clear();
+	_text.resize(10);
+	_startIdx = 0;
+	_redrawRequired = true;
+}
+
 void Console::printTosText(int tosIndex, bool shouldAddToCurrentLine) {
 	if (g_engine->isDosDemo()) {
 		debug("TosIndex: %d", tosIndex);
diff --git a/engines/darkseed/console.h b/engines/darkseed/console.h
index b614456c44f..2173241f03b 100644
--- a/engines/darkseed/console.h
+++ b/engines/darkseed/console.h
@@ -46,6 +46,8 @@ public:
 	Console(TosText *tostext, Sound *sound);
 	~Console();
 
+	void clear();
+
 	void printTosText(int tosIndex, bool shouldAddToCurrentLine = false);
 	void addTextLine(const Common::U32String &text);
 	void addToCurrentLine(const Common::String &text);
diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index 4c4e0a9da7b..e0ed9316c86 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -2706,7 +2706,42 @@ void DarkseedEngine::newGame() {
 	_sound->resetSpeech();
 	_objectVar.reset();
 	_room->_roomNumber = isDosDemo() ? 4 : 0;
+	_delbertspeech = 0;
+	_yvec = 0;
 	_currentDay = 1;
+	_currentTimeInSeconds = 0x7e8e;
+	_fttime = 0;
+
+	_previousRoomNumber = 0;
+	_targetRoomNumber = 0;
+
+	_headAcheMessageCounter = 0;
+	_headacheMessageIdx = 0;
+
+	_sprite_y_scaling_threshold_maybe = 0xf0;
+	_scaledWalkSpeed_maybe = 0;
+	_scaledSpriteWidth = 0;
+	_scaledSpriteHeight = 0;
+
+	_frameBottom = 0;
+
+	_doorEnabled = false;
+	_useDoorTarget = false;
+
+	_counter_2c85_888b = 0;
+
+	_targetPlayerDirection = 0;
+
+	_systemTimerCounter = 0;
+
+	_phoneStatus = 0;
+
+	_soundTimer = 0;
+	_printedcomeheredawson = false;
+
+	_player->_isAutoWalkingToBed = false;
+
+	_console->clear();
 	changeToRoom(_room->_roomNumber);
 
 	doCircles();