X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Freademc.c;h=a192b9ba2c1ca57108edaa0531fc7fecc2c4ca39;hb=4cd59cef0737229da365e385a8762e681a5e471f;hp=a8449a04dd4113b1ffb03b1bcc3498e2e3f4d62c;hpb=d0965bd91225c82b3b099a50050321d84568bb16;p=rocksndiamonds.git

diff --git a/src/game_em/reademc.c b/src/game_em/reademc.c
index a8449a04..a192b9ba 100644
--- a/src/game_em/reademc.c
+++ b/src/game_em/reademc.c
@@ -40,9 +40,15 @@
  * behaviour.
  */
 
+/* changes for game engine integration in Rocks'n'Diamonds:
+ *
+ * added support for rolling spring (not mapped to pushed spring)
+ * - required for Elvis Mine 8, levels 3, 23, 48 and 73
+ */
+
 #define GET_BE16(x)		((&x)[0] << 8 | (&x)[1])
 
-static const short map_emc[256] =
+static const short map_emc_raw[256] =
 {
   Cstone,		Cstone,		Cdiamond,	Cdiamond,	//   0
   Calien,		Calien,		Cpause,		Cpause,		//   4
@@ -62,8 +68,8 @@ static const short map_emc[256] =
   Cdynamite_2,		Cdynamite_3,	Cdynamite_4,	Cacid_s,	//  60
 
   Cexit_1,		Cexit_2,	Cexit_3,	Cballoon,	//  64
-  Cplant,		Cspring,	Cspring,	Cpush_spring_w,	//  68
-  Cpush_spring_e,	Cball_1,	Cball_2,	Candroid,	//  72
+  Cplant,		Cspring,	Cspring,	Cspring_w,	//  68
+  Cspring_e,		Cball_1,	Cball_2,	Candroid,	//  72
   Cpause,		Candroid,	Candroid,	Candroid,	//  76
   Candroid,		Candroid,	Candroid,	Candroid,	//  80
   Candroid,		Cblank,		Cblank,		Cblank,		//  84
@@ -113,6 +119,21 @@ static const short map_emc[256] =
   Cwall_1,		Cblank,		Calpha_copyr,	Cfake_acid_1	// 252
 };
 
+static const short swap_emc[CAVE_TILE_MAX] =
+{
+  [Cdirt]		= Cgrass,
+  [Cgrass]		= Cdirt,
+
+  [Csteel_1]		= Csteel_2,
+  [Csteel_2]		= Csteel_1,
+
+  [Cwall_1]		= Cwall_2,
+  [Cwall_2]		= Cwall_1,
+
+  [Croundwall_1]	= Croundwall_2,
+  [Croundwall_2]	= Croundwall_1
+};
+
 static struct
 {
   int bit_nr;
@@ -256,6 +277,19 @@ static int eater_offset[8] =
 void convert_em_level(unsigned char *src, int file_version)
 {
   int i, x, y, temp;
+  short map_emc[256];
+
+  /* initialize element mapping */
+
+  for (i = 0; i < 256; i++)
+    map_emc[i] = map_emc_raw[i];
+
+  /* swap tiles for pre-EMC caves (older than V5/V6), if needed */
+
+  if (swapTiles_EM(file_version < FILE_VERSION_EM_V5))
+    for (i = 0; i < 256; i++)
+      if (swap_emc[map_emc[i]] != 0)
+	map_emc[i] = swap_emc[map_emc[i]];
 
   /* common to all emc caves */
 
@@ -265,7 +299,7 @@ void convert_em_level(unsigned char *src, int file_version)
   cav.time_seconds = MIN(GET_BE16(src[2110]), 9999);
   cav.gems_needed = src[2095];
 
-  cav.infinite = TRUE;
+  cav.infinite = game_em.use_wrap_around;
   cav.testmode = FALSE;
   cav.teamwork = (src[2150] & 128) != 0;
 
@@ -359,6 +393,9 @@ void convert_em_level(unsigned char *src, int file_version)
     for (x = 0; x < 9; x++)
       cav.eater_array[i][x] = map_emc[src[eater_offset[i] + x]];
 
+  if (file_version < FILE_VERSION_EM_V6)
+    cav.num_eater_arrays = 4;
+
   /* ball */
 
   temp = map_emc[src[2159]];
@@ -521,12 +558,12 @@ static const unsigned char map_v4[256] =
   240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153	// 240
 };
 
-static const unsigned char map_v4_eater[32] =
+static const unsigned char map_v4_eater[28] =
 {
   /* filter for v4 eater */
 
   128,18,2,0,      4,8,16,20,       28,37,41,45,     189,180,179,252,	//   0
-  133,134,135,136, 146,147,175,65,  66,64,2,18,      128,128,128,128	//  16
+  133,134,135,136, 146,147,175,65,  66,64,2,18				//  16
 };
 
 static boolean filename_has_v1_format(char *filename)
@@ -639,7 +676,7 @@ int cleanup_em_level(unsigned char *src, int length, char *filename)
     for (i = 0; i < 2048; i++)		/* cave */
       src[i] = map_v4[src[i]];
     for (i = 2048; i < 2084; i++)	/* eaters */
-      src[i] = map_v4_eater[src[i] % 32];
+      src[i] = map_v4_eater[src[i] < 28 ? src[i] : 0];
     for (i = 2112; i < 2148; i++)	/* eaters */
       src[i] = src[i - 64];
 
@@ -656,8 +693,7 @@ int cleanup_em_level(unsigned char *src, int length, char *filename)
 
     /* if file has length of old-style level file, print (wrong) magic byte */
     if (length < 2110)
-      Error(ERR_WARN, "unknown magic byte 0x%02x at position 0x%04x",
-	    src[1983], 1983);
+      Warn("unknown magic byte 0x%02x at position 0x%04x", src[1983], 1983);
 
     return FILE_VERSION_EM_UNKNOWN;
   }
@@ -751,7 +787,7 @@ int cleanup_em_level(unsigned char *src, int length, char *filename)
   length = 2172;
 
   if (options.debug)
-    Error(ERR_DEBUG, "EM level file version: %d", file_version);
+    Debug("level:native:EM", "EM level file version: %d", file_version);
 
   return file_version;
 }