[Scummvm-git-logs] scummvm master -> 53d0759bb8931cba2840efe966690723627479cd

[dreammaster]

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

Summary:
53d0759bb8 GLK: SCOTT: Shift title screen array to Globals, which is more appropriate


Commit: 53d0759bb8931cba2840efe966690723627479cd
    https://github.com/scummvm/scummvm/commit/53d0759bb8931cba2840efe966690723627479cd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-30T20:44:30+10:00

Commit Message:
GLK: SCOTT: Shift title screen array to Globals, which is more appropriate

Changed paths:
    engines/glk/scott/globals.h
    engines/glk/scott/load_zx_spectrum.cpp
    engines/glk/scott/scott.h


diff --git a/engines/glk/scott/globals.h b/engines/glk/scott/globals.h
index 6d4c6b6d9a8..aff6425ad2a 100644
--- a/engines/glk/scott/globals.h
+++ b/engines/glk/scott/globals.h
@@ -221,6 +221,8 @@ public:
 	uint8_t *_ti99ExplicitActions = nullptr;
 	uint8_t **_verbActionOffsets = nullptr;
 
+	Common::Array<byte> _spectrumTitleScreen;
+
 public:
 	Globals();
 	~Globals();
diff --git a/engines/glk/scott/load_zx_spectrum.cpp b/engines/glk/scott/load_zx_spectrum.cpp
index 8a6ae4af7e5..15ab9f5f794 100644
--- a/engines/glk/scott/load_zx_spectrum.cpp
+++ b/engines/glk/scott/load_zx_spectrum.cpp
@@ -47,7 +47,7 @@
 namespace Glk {
 namespace Scott {
 
-#define TITLE_SCREEN g_scott->_spectrumTitleScreen
+#define TITLE_SCREEN g_globals->_spectrumTitleScreen
 
 static void loadZXSpectrumGame(Common::String md5) {
 	int offset;
diff --git a/engines/glk/scott/scott.h b/engines/glk/scott/scott.h
index bd31302840b..2aa769c2fb5 100644
--- a/engines/glk/scott/scott.h
+++ b/engines/glk/scott/scott.h
@@ -192,9 +192,6 @@ private:
 	void printTitleScreenBuffer();
 	void printTitleScreenGrid();
 
-public:
-	Common::Array<byte> _spectrumTitleScreen;
-
 public:
 	void drawImage(int image);
 	void output(const Common::String &a);