[Scummvm-git-logs] scummvm master -> 092ce97d83d2b4f8a6b3dff5979c474f72e2d98a

[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:
092ce97d83 GLK: COMPREHEND: Fix loading item graphics for CC disk 2


Commit: 092ce97d83d2b4f8a6b3dff5979c474f72e2d98a
    https://github.com/scummvm/scummvm/commit/092ce97d83d2b4f8a6b3dff5979c474f72e2d98a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-03T19:32:51-07:00

Commit Message:
GLK: COMPREHEND: Fix loading item graphics for CC disk 2

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 46a4d8e422..7a29ea4ef5 100644
--- a/engines/glk/comprehend/game_cc.cpp
+++ b/engines/glk/comprehend/game_cc.cpp
@@ -47,6 +47,8 @@ void CrimsonCrownGame::setupDisk(uint diskNum) {
 	_locationGraphicFiles.push_back(Common::String::format("rb.ms%u", diskNum));
 	if (diskNum == 1)
 		_locationGraphicFiles.push_back("RC.ms1");
+
+	_itemGraphicFiles.clear();
 	_itemGraphicFiles.push_back(Common::String::format("oa.ms%u", diskNum));
 	_itemGraphicFiles.push_back(Common::String::format("ob.ms%u", diskNum));
 
@@ -88,7 +90,7 @@ void CrimsonCrownGame::handleSpecialOpcode(uint8 operand) {
 
 	case 3:
 		// Game over - failure
-		setupDisk(1);
+		_newDiskNum = 1;
 		game_restart();
 		break;