[Scummvm-git-logs] scummvm branch-2-9 -> 50f971d2f6cc73466c3b2ad4eef9381537c23a9b

criezy noreply at scummvm.org
Tue Nov 26 23:08:52 UTC 2024


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:
50f971d2f6 AGS: Clear all screen overlays in unload_game()


Commit: 50f971d2f6cc73466c3b2ad4eef9381537c23a9b
    https://github.com/scummvm/scummvm/commit/50f971d2f6cc73466c3b2ad4eef9381537c23a9b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2024-11-26T23:00:15Z

Commit Message:
AGS: Clear all screen overlays in unload_game()

This is what upstream AGS does in the 3.6.1 and master branches,
while our code corresponded to the 3.6.0 branch.
This fixes an issue where deleting the screenoverlay vector later
on would try to access an already cleared SpriteCache.

This sould fix bugs #15488 and bug #15510.

Changed paths:
    engines/ags/engine/ac/game.cpp


diff --git a/engines/ags/engine/ac/game.cpp b/engines/ags/engine/ac/game.cpp
index ca76cf24484..d0a47f4d5ae 100644
--- a/engines/ags/engine/ac/game.cpp
+++ b/engines/ags/engine/ac/game.cpp
@@ -394,7 +394,7 @@ void unload_game() {
 	_GP(guis).clear();
 	_GP(scrGui).clear();
 
-	remove_screen_overlay(-1);
+	get_overlays().clear();
 
 	resetRoomStatuses();
 	_GP(thisroom).Free();




More information about the Scummvm-git-logs mailing list