X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame_em%2Fconvert.c;h=07c18a051259607a6e7bfdfebf56ed521ace2f44;hb=4d765f70b0accf29a631e833e7ddfd57ef8bbfee;hp=2935a10123be7a50c10443820dd03d93960f52ea;hpb=d9b86b7b2ebe0b2be3926656c3bbdcd060ee5811;p=rocksndiamonds.git

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 2935a101..07c18a05 100644
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -8,9 +8,7 @@
  * inconsequential, but no doubt it will break some caves.
  */
 
-#include "global.h"
-#include "tile.h"
-#include "level.h"
+#include "main_em.h"
 
 
 static unsigned char remap_v6[256] =
@@ -151,7 +149,7 @@ int cleanup_em_level(unsigned char *src, int length)
     for (i = 2112; i < 2148; i++) src[i] = src[i - 64];
   }
   else if (length >= 2106 &&
-	   src[0] == 241 &&
+	   src[0] == 241 &&	/* <-- Emerald Mine I levels */
 	   src[1983] == 27)
   {
     unsigned char j = 94;
@@ -171,7 +169,7 @@ int cleanup_em_level(unsigned char *src, int length)
   }
 #if 1
   else if (length >= 2106 &&
-	   src[0] == 245 &&
+	   src[0] == 245 &&	/* <-- Emerald Mine II levels */
 	   src[1983] == 27)
   {
     unsigned char j = 94;
@@ -188,13 +186,18 @@ int cleanup_em_level(unsigned char *src, int length)
       src[i] = remap_v4eater[src[i] >= 28 ? 0 : src[i]];
     for (i = 2112; i < 2148; i++)
       src[i] = src[i - 64];
+
+    /* fix copyright sign in Emerald Mine II levels */
+    for (i = 0; i < 2048; i++)
+      if (src[i] == 241)
+	src[i] = 254;		/* replace 'Xdecor_1' with 'Xalpha_copyr' */
   }
 #endif
   else
   {
     /* ---------- this cave has unknown file format ---------- */
 
-#if 1
+#if 0
     printf("::: %d, %d\n", src[0], src[1983]);
 #endif
 
@@ -538,10 +541,24 @@ static unsigned short remap_emerald[256] =
   Xblank,		Xblank,		Xblank,		Xblank,
 #else
   /* special elements added to solve compatibility problems */
-  Xblank,		Xblank,		Xblank,		Xfake_acid_1
+  Xblank,		Xblank,		Xalpha_copyr,	Xfake_acid_1
 #endif
 };
 
+static int get_em_element(unsigned short em_element_raw, int file_version)
+{
+  int em_element = remap_emerald[em_element_raw];
+
+  if (file_version <= FILE_VERSION_EM_V4)
+  {
+    /* versions up to V4 had no grass, but only sand/dirt */
+    if (em_element == Xgrass)
+      em_element = Xdirt;
+  }
+
+  return em_element;
+}
+
 void convert_em_level(unsigned char *src, int file_version)
 {
   static int eater_offset[8] =
@@ -611,9 +628,10 @@ void convert_em_level(unsigned char *src, int file_version)
 
   for (i = 0; i < 8; i++)
     for (x = 0; x < 9; x++)
-      lev.eater_array[i][x] = remap_emerald[src[eater_offset[i] + x]];
+      lev.eater_array[i][x] =
+	get_em_element(src[eater_offset[i] + x], file_version);
 
-  temp = remap_emerald[src[0x86F]];
+  temp = get_em_element(src[0x86F], file_version);
   for (y = 0; y < 8; y++)
   {
     if (src[0x872] & 1)
@@ -883,7 +901,8 @@ void convert_em_level(unsigned char *src, int file_version)
   temp = 0;
   for (y = 0; y < lev.height; y++)
     for (x = 0; x < lev.width; x++)
-      native_em_level.cave[x + 1][y + 1] = remap_emerald[src[temp++]];
+      native_em_level.cave[x + 1][y + 1] =
+	get_em_element(src[temp++], file_version);
 
   /* at last, set the two players at their positions in the playfield */
   /* (native EM[C] levels always have exactly two players in a level) */
@@ -970,7 +989,7 @@ void prepare_em_level(void)
     }
   }
 
-  num_tape_players = getActivePlayers_EM();
+  num_tape_players = getNumActivePlayers_EM();
 
   if (num_tape_players != -1)
     lev.home_initial = MIN(lev.home_initial, num_tape_players);
@@ -1021,4 +1040,10 @@ void prepare_em_level(void)
 	   i, ply[i].x_initial, ply[i].y_initial, ply[i].alive);
 #endif
   }
+
+  game_em.any_player_moving = FALSE;
+  game_em.last_moving_player = 0;	/* default: first player */
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    game_em.last_player_direction[i] = MV_NONE;
 }