[Scummvm-git-logs] scummvm master -> 5ad17a1e01e4fe002604c301cdc0f9df08ab44c3

[dreammaster]

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:
5ad17a1e01 GLK: COMPREHEND: Fix strings loading after GMM loading Talisman save


Commit: 5ad17a1e01e4fe002604c301cdc0f9df08ab44c3
    https://github.com/scummvm/scummvm/commit/5ad17a1e01e4fe002604c301cdc0f9df08ab44c3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-16T20:50:28-08:00

Commit Message:
GLK: COMPREHEND: Fix strings loading after GMM loading Talisman save

Changed paths:
    engines/glk/comprehend/game.h
    engines/glk/comprehend/game_tm.cpp
    engines/glk/comprehend/game_tm.h


diff --git a/engines/glk/comprehend/game.h b/engines/glk/comprehend/game.h
index 98c8db9838..85758f8b38 100644
--- a/engines/glk/comprehend/game.h
+++ b/engines/glk/comprehend/game.h
@@ -184,7 +184,7 @@ public:
 	Common::String stringLookup(uint16 index);
 	Common::String instrStringLookup(uint8 index, uint8 table);
 
-	void playGame();
+	virtual void playGame();
 
 	void move_to(uint8 room);
 	Room *get_room(uint16 index);
diff --git a/engines/glk/comprehend/game_tm.cpp b/engines/glk/comprehend/game_tm.cpp
index 0c6f8dbfff..c25dbbd4fa 100644
--- a/engines/glk/comprehend/game_tm.cpp
+++ b/engines/glk/comprehend/game_tm.cpp
@@ -101,9 +101,12 @@ void TalismanGame::loadStrings() {
 	}
 }
 
-void TalismanGame::beforeGame() {
+void TalismanGame::playGame() {
 	loadStrings();
+	ComprehendGameV2::playGame();
+}
 
+void TalismanGame::beforeGame() {
 	// Draw the title
 	g_comprehend->drawPicture(TITLE_IMAGE);
 
diff --git a/engines/glk/comprehend/game_tm.h b/engines/glk/comprehend/game_tm.h
index 7a696be773..2e6281dc93 100644
--- a/engines/glk/comprehend/game_tm.h
+++ b/engines/glk/comprehend/game_tm.h
@@ -40,6 +40,7 @@ public:
 	TalismanGame();
 	~TalismanGame() override {}
 
+	void playGame() override;
 	void beforeGame() override;
 	void beforeTurn() override;
 	void beforePrompt() override;