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

[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:
e2fb4558f5 GLK: COMPREHEND: Add OO-Topos title screen


Commit: e2fb4558f5f0ecad3a8e0dfb3d285ef900e75a7e
    https://github.com/scummvm/scummvm/commit/e2fb4558f5f0ecad3a8e0dfb3d285ef900e75a7e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-11-04T20:09:06-08:00

Commit Message:
GLK: COMPREHEND: Add OO-Topos title screen

Changed paths:
    engines/glk/comprehend/game_oo.cpp
    engines/glk/comprehend/game_oo.h
    engines/glk/comprehend/pics.cpp


diff --git a/engines/glk/comprehend/game_oo.cpp b/engines/glk/comprehend/game_oo.cpp
index 2658acaaa3..e7a2e64bc1 100644
--- a/engines/glk/comprehend/game_oo.cpp
+++ b/engines/glk/comprehend/game_oo.cpp
@@ -23,6 +23,7 @@
 #include "glk/comprehend/game_oo.h"
 #include "glk/comprehend/comprehend.h"
 #include "glk/comprehend/draw_surface.h"
+#include "glk/comprehend/pics.h"
 
 namespace Glk {
 namespace Comprehend {
@@ -59,6 +60,19 @@ OOToposGame::OOToposGame() : ComprehendGameV2(), _restartMode(RESTART_IMMEDIATE)
 
 	_colorTable = 1;
 	_gameStrings = &OO_STRINGS;
+	_titleGraphicFile = "t0";
+}
+
+void OOToposGame::beforeGame() {
+	// Draw the title
+	g_comprehend->drawPicture(TITLE_IMAGE);
+
+	// Print game information
+	console_println("Story by Michael and Muffy Berlyn, graphics by Raim und Redlich and Brian Poff");
+	console_println("IBM version by Jeffrey A. Jay. Copyright 1987  POLARWARE, Inc.");
+	g_comprehend->readChar();
+
+	g_comprehend->glk_window_clear(g_comprehend->_bottomWindow);
 }
 
 int OOToposGame::roomIsSpecial(unsigned room_index,
diff --git a/engines/glk/comprehend/game_oo.h b/engines/glk/comprehend/game_oo.h
index 373c67d20d..77809e262a 100644
--- a/engines/glk/comprehend/game_oo.h
+++ b/engines/glk/comprehend/game_oo.h
@@ -40,6 +40,7 @@ public:
 	OOToposGame();
 	~OOToposGame() override {}
 
+	void beforeGame() override;
 	void beforeTurn() override;
 	int roomIsSpecial(unsigned room_index, unsigned *room_desc_string) override;
 	void handleSpecialOpcode(uint8 operand) override;
diff --git a/engines/glk/comprehend/pics.cpp b/engines/glk/comprehend/pics.cpp
index 138a87f694..11ee2aa8fd 100644
--- a/engines/glk/comprehend/pics.cpp
+++ b/engines/glk/comprehend/pics.cpp
@@ -76,7 +76,8 @@ Pics::ImageFile::ImageFile(const Common::String &filename) {
 	 * image offsets start at the beginning of the image file.
 	 */
 	version = f.readUint16LE();
-	if (version == 0x6300 /* Single image file */) {
+	if (version == 0x6300 /* Single image file */
+			|| version == 0x81f3 /* OO-Topos title - t0 */) {
 		_imageOffsets.resize(1);
 		_imageOffsets[0] = 4;
 		return;