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

[neuromancer]

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:
dac71ddb2d FREESCAPE: avoid crashing when selecting german language in castle


Commit: dac71ddb2d1b00298dfa3152988591e32e040293
    https://github.com/scummvm/scummvm/commit/dac71ddb2d1b00298dfa3152988591e32e040293
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-06-26T21:30:32+02:00

Commit Message:
FREESCAPE: avoid crashing when selecting german language in castle

Changed paths:
    engines/freescape/games/castle/dos.cpp


diff --git a/engines/freescape/games/castle/dos.cpp b/engines/freescape/games/castle/dos.cpp
index fc4e7a3f207..8486c62d02f 100644
--- a/engines/freescape/games/castle/dos.cpp
+++ b/engines/freescape/games/castle/dos.cpp
@@ -88,20 +88,22 @@ void CastleEngine::loadAssetsDOSFullGame() {
 				break;
 			case Common::FR_FRA:
 				stream = decryptFile("CMLF");
+				loadMessagesVariableSize(stream, 0x11, 164);
 				break;
 			case Common::DE_DEU:
 				stream = decryptFile("CMLG");
+				loadMessagesVariableSize(stream, 0x11, 164);
 				break;
 			case Common::EN_ANY:
 				stream = decryptFile("CMLE");
+				loadRiddles(stream, 0xaae, 11);
+				loadMessagesVariableSize(stream, 0x11, 164);
 				break;
 			default:
 				error("Invalid or unsupported language: %x", _language);
 		}
 
 		loadFonts(kFreescapeCastleFont, 59);
-		loadMessagesVariableSize(stream, 0x11, 164);
-		loadRiddles(stream, 0xaae, 11);
 		delete stream;
 
 		stream = decryptFile("CMEDF");