[Scummvm-git-logs] scummvm master -> 7c3a2a5896eacb1d508165d7272a10568880d7d3

neuromancer noreply at scummvm.org
Wed Aug 9 17:14:17 UTC 2023


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:
7c3a2a5896 FREESCAPE: fix crash loading some driller amiga demos


Commit: 7c3a2a5896eacb1d508165d7272a10568880d7d3
    https://github.com/scummvm/scummvm/commit/7c3a2a5896eacb1d508165d7272a10568880d7d3
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-08-09T19:16:06+02:00

Commit Message:
FREESCAPE: fix crash loading some driller amiga demos

Changed paths:
    engines/freescape/games/driller/amiga.cpp


diff --git a/engines/freescape/games/driller/amiga.cpp b/engines/freescape/games/driller/amiga.cpp
index 273a7ce1ef3..66906b12ac0 100644
--- a/engines/freescape/games/driller/amiga.cpp
+++ b/engines/freescape/games/driller/amiga.cpp
@@ -118,7 +118,7 @@ void DrillerEngine::loadAssetsAmigaDemo() {
 	if (!file.isOpen())
 		error("Failed to open 'driller' file");
 
-	if (_variant | GF_AMIGA_MAGAZINE_DEMO) {
+	if (_variant & GF_AMIGA_MAGAZINE_DEMO) {
 		loadFonts(&file, 0xa62);
 		loadMessagesFixedSize(&file, 0x3df0, 14, 20);
 		loadGlobalObjects(&file, 0x3ba6, 8);
@@ -153,7 +153,7 @@ void DrillerEngine::drawAmigaAtariSTUI(Graphics::Surface *surface) {
 	Common::String coords;
 
 	// It seems that some demos will not include the complete font
-	if (!isDemo() || (_variant | GF_AMIGA_MAGAZINE_DEMO) || (_variant | GF_ATARI_MAGAZINE_DEMO)) {
+	if (!isDemo() || (_variant & GF_AMIGA_MAGAZINE_DEMO) || (_variant & GF_ATARI_MAGAZINE_DEMO)) {
 		drawStringInSurface("x", 37, 18, white, transparent, surface, 82);
 		coords = Common::String::format("%04d", 2 * int(_position.x()));
 		for (int i = 0; i < 4; i++)




More information about the Scummvm-git-logs mailing list