[Scummvm-git-logs] scummvm master -> ddc9a63e85b301046f266358279d469c475019b0

[mduggan]

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:
ddc9a63e85 ULTIMA: ULTIMA6: Fix map not showing when using RTL


Commit: ddc9a63e85b301046f266358279d469c475019b0
    https://github.com/scummvm/scummvm/commit/ddc9a63e85b301046f266358279d469c475019b0
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-11-20T09:11:59+11:00

Commit Message:
ULTIMA: ULTIMA6: Fix map not showing when using RTL

Change local static variable to a field so it is reinitialized
when using the return-to-launcher feature.

Fixes #13971

Changed paths:
    engines/ultima/nuvie/gui/widgets/map_window.cpp
    engines/ultima/nuvie/gui/widgets/map_window.h


diff --git a/engines/ultima/nuvie/gui/widgets/map_window.cpp b/engines/ultima/nuvie/gui/widgets/map_window.cpp
index 22efa8660ba..1746d108195 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.cpp
+++ b/engines/ultima/nuvie/gui/widgets/map_window.cpp
@@ -173,6 +173,8 @@ MapWindow::MapWindow(Configuration *cfg, Map *m): GUI_Widget(NULL, 0, 0, 0, 0) {
 
 	lighting_update_required = true;
 
+	game_started = false;
+
 	set_interface();
 }
 
@@ -614,7 +616,6 @@ bool MapWindow::in_window(uint16 x, uint16 y, uint8 z) {
 void MapWindow::update() {
 	GameClock *clock = game->get_clock();
 	Events *event = game->get_event();
-	static bool game_started = false; // set to true on the first update()
 	static uint32 last_update_time = clock->get_ticks();
 	uint32 update_time = clock->get_ticks();
 
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.h b/engines/ultima/nuvie/gui/widgets/map_window.h
index d078e11e53d..6404bdbc4e4 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.h
+++ b/engines/ultima/nuvie/gui/widgets/map_window.h
@@ -146,6 +146,8 @@ class MapWindow: public GUI_Widget {
 
 	bool lighting_update_required;
 
+	bool game_started;
+
 public:
 
 	MapWindow(Configuration *cfg, Map *m);