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

[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:
e54fab21c2 GLK: COMPREHEND: Fixes to OO-Topos endgame display


Commit: e54fab21c2faeab8062391805d145a7ece5d2465
    https://github.com/scummvm/scummvm/commit/e54fab21c2faeab8062391805d145a7ece5d2465
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-07T20:34:13-08:00

Commit Message:
GLK: COMPREHEND: Fixes to OO-Topos endgame display

Changed paths:
    engines/glk/comprehend/game_oo.cpp
    engines/glk/comprehend/game_opcodes.cpp


diff --git a/engines/glk/comprehend/game_oo.cpp b/engines/glk/comprehend/game_oo.cpp
index 8e60c81e30..5274f04c88 100644
--- a/engines/glk/comprehend/game_oo.cpp
+++ b/engines/glk/comprehend/game_oo.cpp
@@ -186,8 +186,8 @@ void OOToposGame::handleSpecialOpcode(uint8 operand) {
 		break;
 
 	case 5:
-		// Won the game, or fall-through from case 3
-		game_restart();
+		// Won the game
+		g_comprehend->quitGame();
 		break;
 
 	case 6:
diff --git a/engines/glk/comprehend/game_opcodes.cpp b/engines/glk/comprehend/game_opcodes.cpp
index 0213c8b485..abffa35812 100644
--- a/engines/glk/comprehend/game_opcodes.cpp
+++ b/engines/glk/comprehend/game_opcodes.cpp
@@ -774,6 +774,7 @@ void ComprehendGameV2::execute_opcode(const Instruction *instr, const Sentence *
 
 	case OPCODE_DRAW_ROOM:
 		g_comprehend->drawLocationPicture(instr->_operand[0] - 1);
+		g_comprehend->readChar();
 		break;
 
 	case OPCODE_INVENTORY_FULL: