From: Holger Schemel <holger.schemel@virtion.de>
Date: Sat, 31 Aug 2024 19:21:48 +0000 (+0200)
Subject: changed using non-scanned elements when reading C64 cave files
X-Git-Tag: 4.4.0.0-test-4~280
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=882c905048c9acb725d219535d2eabd52e187723;p=rocksndiamonds.git

changed using non-scanned elements when reading C64 cave files
---

diff --git a/src/game_bd/bd_c64import.c b/src/game_bd/bd_c64import.c
index 5e44769d..47fea7e1 100644
--- a/src/game_bd/bd_c64import.c
+++ b/src/game_bd/bd_c64import.c
@@ -462,7 +462,7 @@ static int slime_shift_msb(int c64_data)
 static GdElement bd1_import(byte c, int i)
 {
   if (c < ARRAY_SIZE(bd1_import_table))
-    return bd1_import_table[c];
+    return non_scanned_pair(bd1_import_table[c]);
 
   Warn("Invalid BD1 element in imported file at cave data %d: %d", i, c);
 
@@ -483,7 +483,7 @@ static GdElement deluxecaves_1_import(byte c, int i)
 static GdElement firstboulder_import(byte c, int i)
 {
   if (c < ARRAY_SIZE(firstboulder_import_table))
-    return firstboulder_import_table[c];
+    return non_scanned_pair(firstboulder_import_table[c]);
 
   Warn("Invalid 1stB element in imported file at cave data %d: %d", i, c);
 
@@ -493,7 +493,7 @@ static GdElement firstboulder_import(byte c, int i)
 static GdElement crazylight_import(byte c, int i)
 {
   if (c < ARRAY_SIZE(gd_crazylight_import_table))
-    return gd_crazylight_import_table[c] & O_MASK;    // & O_MASK: do not import "scanned" flag
+    return non_scanned_pair(gd_crazylight_import_table[c]);
 
   Warn("Invalid CrLi element in imported file at cave data %d: %d", i, c);