[Scummvm-git-logs] scummvm master -> 58d9cb40bdc5b98120ca43804bf1d0940fcd937d

[eriktorbjorn]

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

Summary:
58d9cb40bd SWORD2: Clear screen on startGame()


Commit: 58d9cb40bdc5b98120ca43804bf1d0940fcd937d
    https://github.com/scummvm/scummvm/commit/58d9cb40bdc5b98120ca43804bf1d0940fcd937d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-10-29T21:29:51+01:00

Commit Message:
SWORD2: Clear screen on startGame()

If we try to load a non-existing savegame on startup, the game will open
a "load game" dialog. If we cancel that, the game will start. This will
clear any garbage still present on screen.

Changed paths:
    engines/sword2/sword2.cpp


diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 9bf7af5dabc..39d8a2d7c20 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -521,6 +521,13 @@ void Sword2Engine::gameCycle() {
 }
 
 void Sword2Engine::startGame() {
+	// Normally not needed, but we could be coming here from a cancelled
+	// load game dialog. And since the first cutscene doesn't cover the
+	// entire screen, that would leave garbage on the rest of it.
+
+	_screen->clearScene();
+	_screen->updateDisplay();
+
 	// Boot the game straight into a start script. It's always George's
 	// script #1, but with different ScreenManager objects depending on
 	// if it's the demo or the full game, or if we're using a boot param.