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

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 2935a101..f53bd21d 100644
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -151,7 +151,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 +171,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,6 +188,11 @@ 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
@@ -538,7 +543,7 @@ 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
 };
 
@@ -1021,4 +1026,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;
 }