rnd-20060319-2-src

[rocksndiamonds.git] / src / game_em / convert.c

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 9b888ffce11733dff5f6825af16a24491971ee77..281cd25bfec5527ba9701d61fcca6ea549fab45b 100644 (file)
--- 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,6 +186,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 +541,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
 };
 
@@ -970,7 +973,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);