X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Freademc.c;h=5184d8d72ed9bb217d57d00e2e622ed1049fe50c;hb=9e3b9d32e82663858c54a3884a2bb7680d458218;hp=1308615c363d7ceee40d581fa8c11036e933ca1d;hpb=04c0f30221267649e3c1098270eda66272fce40e;p=rocksndiamonds.git

diff --git a/src/game_em/reademc.c b/src/game_em/reademc.c
index 1308615c..5184d8d7 100644
--- a/src/game_em/reademc.c
+++ b/src/game_em/reademc.c
@@ -40,6 +40,12 @@
  * 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_raw[256] =
@@ -62,8 +68,8 @@ static const short map_emc_raw[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
@@ -387,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]];
@@ -549,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)
@@ -667,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];