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

[dreammaster]

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

Summary:
cfe1dfcaca GLK: COMPREHEND: CC: Remove script call from cutscene
e70a2b371a GLK: COMPREHEND: Describe items in room as original did


Commit: cfe1dfcaca4059eb05bde57a5516233c2249af3e
    https://github.com/scummvm/scummvm/commit/cfe1dfcaca4059eb05bde57a5516233c2249af3e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-15T20:38:19-07:00

Commit Message:
GLK: COMPREHEND: CC: Remove script call from cutscene

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


diff --git a/engines/glk/comprehend/game_cc.cpp b/engines/glk/comprehend/game_cc.cpp
index 09f79a6536..f1c97905a5 100644
--- a/engines/glk/comprehend/game_cc.cpp
+++ b/engines/glk/comprehend/game_cc.cpp
@@ -111,9 +111,6 @@ void CrimsonCrownGame::crystalBallCutscene() {
 		if (g_comprehend->shouldQuit())
 			return;
 	}
-
-	// TODO: Is this actually a function call?
-	eval_function(&_functions[14], nullptr, nullptr);
 } 
 
 void CrimsonCrownGame::beforePrompt() {


Commit: e70a2b371af56213271170a098aaa939e2421fff
    https://github.com/scummvm/scummvm/commit/e70a2b371af56213271170a098aaa939e2421fff
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-15T20:38:19-07:00

Commit Message:
GLK: COMPREHEND: Describe items in room as original did

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


diff --git a/engines/glk/comprehend/game.cpp b/engines/glk/comprehend/game.cpp
index ddec3210b9..22421a8d48 100644
--- a/engines/glk/comprehend/game.cpp
+++ b/engines/glk/comprehend/game.cpp
@@ -375,8 +375,8 @@ void ComprehendGame::describe_objects_in_current_room() {
 	for (i = 0; i < _items.size(); i++) {
 		item = &_items[i];
 
-		if (item->_room == _currentRoom &&
-		        item->_stringDesc != 0)
+		if (item->_room == _currentRoom && item->_stringDesc != 0
+				&& !(item->_flags & ITEMF_INVISIBLE))
 			count++;
 	}
 
@@ -386,8 +386,8 @@ void ComprehendGame::describe_objects_in_current_room() {
 		for (i = 0; i < _items.size(); i++) {
 			item = &_items[i];
 
-			if (item->_room == _currentRoom &&
-			        item->_stringDesc != 0)
+			if (item->_room == _currentRoom && item->_stringDesc != 0
+					&& !(item->_flags & ITEMF_INVISIBLE))
 				console_println(stringLookup(item->_stringDesc).c_str());
 		}
 	}
@@ -407,10 +407,7 @@ void ComprehendGame::update() {
 	if (_updateFlags & UPDATE_ROOM_DESC)
 		console_println(stringLookup(room_desc_string).c_str());
 
-	// TODO: Transylvania at least doesn't describe items in the room explicitly.
-	// Determine which games actually do so
-	if ((_updateFlags & UPDATE_ITEM_LIST) && _comprehendVersion == 2 &&
-	        room_type == ROOM_IS_NORMAL)
+	if ((_updateFlags & UPDATE_ITEM_LIST) && room_type == ROOM_IS_NORMAL)
 		describe_objects_in_current_room();
 
 	_updateFlags = 0;
diff --git a/engines/glk/comprehend/game_data.h b/engines/glk/comprehend/game_data.h
index 542c964ea1..1c4bb37275 100644
--- a/engines/glk/comprehend/game_data.h
+++ b/engines/glk/comprehend/game_data.h
@@ -158,8 +158,12 @@ enum {
 #define ROOM_NOWHERE 0xff
 
 /* Item flags */
-#define ITEMF_WEIGHT_MASK (0x3)
-#define ITEMF_CAN_TAKE (1 << 3)
+enum ItemFlag {
+	ITEMF_WEIGHT_MASK = 0x3,
+	ITEMF_CAN_TAKE    = 1 << 3,
+	ITEMF_UNKNOWN     = 1 << 6,
+	ITEMF_INVISIBLE   = 1 << 7
+};
 
 /* Word types */
 #define WORD_TYPE_VERB 0x01