[Scummvm-git-logs] scummvm master -> 75ebe8c949a192756396a6c2ea769a2b05c37f60

[dreammaster]

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

Summary:
8d634e8bd3 GLK: COMPREHEND: Allow for Apple 2 ship mission code
717c7e06c5 GLK: COPMREHEND: Fix OO-Topos fuel check
75ebe8c949 GLK: COMPREHEND: Clarify OO-Topos ship room flag


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

Commit Message:
GLK: COMPREHEND: Allow for Apple 2 ship mission code

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


diff --git a/engines/glk/comprehend/game_oo.cpp b/engines/glk/comprehend/game_oo.cpp
index 7807454ed9..ab4d1a818c 100644
--- a/engines/glk/comprehend/game_oo.cpp
+++ b/engines/glk/comprehend/game_oo.cpp
@@ -154,6 +154,10 @@ void OOToposGame::beforePrompt() {
 void OOToposGame::afterPrompt() {
 	ComprehendGameV2::afterPrompt();
 
+	// WORKAROUND: Allow for the Apple 2 password in the DOS version
+	if (!scumm_stricmp(_inputLine, "vug957a"))
+		strcpy(_inputLine, "tse957x");
+
 	if (_currentRoom != _currentRoomCopy)
 		_updateFlags |= UPDATE_GRAPHICS;
 	_currentRoom = _currentRoomCopy;


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

Commit Message:
GLK: COPMREHEND: Fix OO-Topos fuel check

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


diff --git a/engines/glk/comprehend/game_opcodes.cpp b/engines/glk/comprehend/game_opcodes.cpp
index a390fd1827..0213c8b485 100644
--- a/engines/glk/comprehend/game_opcodes.cpp
+++ b/engines/glk/comprehend/game_opcodes.cpp
@@ -746,6 +746,11 @@ void ComprehendGameV2::execute_opcode(const Instruction *instr, const Sentence *
 	Room *room = get_room(_currentRoom);
 	Item *item;
 
+	// In case a single opcode is being executed outside of a function, use a dummy function state
+	FunctionState dummyState;
+	if (!func_state)
+		func_state = &dummyState;
+
 	if ((instr->_opcode & 0x30) == 0x30) {
 		// First operand comes from entered sentence noun, shifting out existing operands
 		instrCopy = *instr;


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

Commit Message:
GLK: COMPREHEND: Clarify OO-Topos ship room flag

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


diff --git a/engines/glk/comprehend/game_oo.cpp b/engines/glk/comprehend/game_oo.cpp
index ab4d1a818c..8e60c81e30 100644
--- a/engines/glk/comprehend/game_oo.cpp
+++ b/engines/glk/comprehend/game_oo.cpp
@@ -29,7 +29,7 @@ namespace Glk {
 namespace Comprehend {
 
 enum OOToposRoomFlag {
-	OO_ROOM_FLAG_FUEL = 1,
+	OO_ROOM_IN_SHIP = 1,
 	OO_ROOM_FLAG_DARK = 2
 };
 
@@ -331,7 +331,7 @@ void OOToposGame::checkShipFuel() {
 	for (int idx = 168; idx < 175; ++idx, ++_stringVal1, ++_stringVal2) {
 		if (_flags[idx]) {
 			Item *item = get_item(ITEMS[_stringVal2] - 1);
-			if (item->_room == ROOM_INVENTORY || (get_room(item->_room)->_flags & OO_ROOM_FLAG_FUEL) != 0) {
+			if (item->_room == ROOM_INVENTORY || (get_room(item->_room)->_flags & OO_ROOM_IN_SHIP) != 0) {
 				Instruction varAdd(0x86, 0x4B, _stringVal1);
 				execute_opcode(&varAdd, nullptr, nullptr);
 			}
@@ -364,7 +364,7 @@ void OOToposGame::checkShipDepart() {
 
 	if (!_shipNotWorking && _flags[OO_FLAG_SUFFICIENT_FUEL]) {
 		Item *item = get_item(ITEM_SERUM_VIAL - 1);
-		if (item->_room == ROOM_INVENTORY || (get_room(item->_room)->_flags & OO_ROOM_FLAG_FUEL) != 0) {
+		if (item->_room == ROOM_INVENTORY || (get_room(item->_room)->_flags & OO_ROOM_IN_SHIP) != 0) {
 			if (!_flags[OO_TRACTOR_BEAM]) {
 				// I detect a tractor beam
 				console_println(_strings2[77].c_str());