projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rnd-20050314-1-src
[rocksndiamonds.git] / src / game_em / convert.c
diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 12d7f351220687318c3a1b9dc371efc0bd790915..6aac3b7d4db789b8f3d711a78096906f65658436 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -17,66 +17,75 @@ static unsigned char remap_v6[256] =
 {
   /* filter crap for v6 */
 
-  0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15,
-  16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28,
-  0,16,2,18,36,37,37,37,40,41,42,43,44,45,128,128,
-  128,148,148,148,45,45,45,148,0,57,58,59,60,61,62,63,
-  64,65,66,67,68,69,69,69,69,73,74,75,118,75,75,75,
-  75,75,75,75,75,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,99,100,68,68,68,68,68,68,68,68,118,118,118,
-  118,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,165,118,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,68,191,
-  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,153,153,153,153,153,153,153,153,153,153
+  0,0,2,2,         4,4,118,118,     8,9,10,11,       12,13,14,15,
+  16,16,18,18,     20,21,22,23,     24,25,26,27,     28,28,118,28,
+  0,16,2,18,       36,37,37,37,     40,41,42,43,     44,45,128,128,
+  128,148,148,     148,45,45,45,    148,0,57,58,     59,60,61,62,63,
+
+  64,65,66,67,     68,69,69,69,     69,73,74,75,     118,75,75,75,
+  75,75,75,75,     75,153,153,153,  153,153,153,153, 153,153,153,153,
+  153,153,153,99,  100,68,68,68,    68,68,68,68,     68,118,118,118,
+  118,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118,
+
+  128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+  144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
+  160,161,162,163, 164,165,165,118, 168,169,170,171, 172,173,174,175,
+  176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,68,191,
+
+  192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
+  208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+  224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+  240,241,242,243, 244,245,153,153, 153,153,153,153, 153,153,153,153
 };
 
 static unsigned char remap_v5[256] =
 {
   /* filter crap for v5 */
 
-  0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15,
-  16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28,
-  0,16,2,18,36,37,37,37,147,41,42,43,44,45,128,128,
-  128,148,148,148,45,45,45,148,0,57,58,59,60,61,62,63,
-  64,65,66,67,68,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,68,68,68,68,68,68,68,68,118,118,118,
-  118,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,153,153,153,153,153,153,118,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,68,153,
-  153,153,153,153,153,153,153,153,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,153,153,153,153,153,153,153,153,153,153,153,153,153,153
+  0,0,2,2,         4,4,118,118,     8,9,10,11,       12,13,14,15,
+  16,16,18,18,     20,21,22,23,     24,25,26,27,     28,28,118,28,
+  0,16,2,18,       36,37,37,37,     147,41,42,43,    44,45,128,128,
+  128,148,148,148, 45,45,45,148,    0,57,58,59,      60,61,62,63,
+
+  64,65,66,67,     68,153,153,153,  153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,68,68,68,68, 68,68,68,68,118, 118,118,
+  118,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118,
+
+  128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+  144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
+  160,153,153,153, 153,153,153,118, 168,169,170,171, 172,173,174,175,
+  176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,68,153,
+
+  153,153,153,153, 153,153,153,153, 200,201,202,203, 204,205,206,207,
+  208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+  224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+  240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153
 };
 
 static unsigned char remap_v4[256] =
 {
   /* filter crap for v4 */
 
-  0,0,2,2,4,4,118,118,8,9,10,11,12,13,14,15,
-  16,16,18,18,20,21,22,23,24,25,26,27,28,28,118,28,
-  0,16,2,18,36,37,37,37,147,41,42,43,44,45,128,128,
-  128,148,148,148,45,45,45,148,0,153,153,59,60,61,62,63,
-  64,65,66,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
-  153,118,114,115,131,118,118,119,120,121,122,118,118,118,118,118,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,68,154,155,156,157,158,160,
-  160,160,160,160,160,160,160,160,160,160,160,160,160,160,160,175,
-  153,153,153,153,153,153,153,153,153,153,153,153,153,153,68,153,
-  153,153,153,153,153,153,153,153,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,153,153,153,153,153,153,153,153,153,153,153,153,153,153
+  0,0,2,2,         4,4,118,118,     8,9,10,11,       12,13,14,15,
+  16,16,18,18,     20,21,22,23,     24,25,26,27,     28,28,118,28,
+  0,16,2,18,       36,37,37,37,     147,41,42,43,    44,45,128,128,
+  128,148,148,148, 45,45,45,148,    0,153,153,59,    60,61,62,63,
+
+  64,65,66,153,    153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153,
+  153,118,114,115, 131,118,118,119, 120,121,122,118, 118,118,118,118,
+
+  128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+  144,145,146,147, 148,149,150,151, 152,68,154,155,  156,157,158,160,
+  160,160,160,160, 160,160,160,160, 160,160,160,160, 160,160,160,175,
+  153,153,153,153, 153,153,153,153, 153,153,153,153, 153,153,68,153,
+
+  153,153,153,153, 153,153,153,153, 200,201,202,203, 204,205,206,207,
+  208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+  224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+  240,241,153,153, 153,153,153,153, 153,153,153,153, 153,153,153,153
 };
 
 static unsigned char remap_v4eater[28] =
@@ -125,8 +134,12 @@ int cleanup_em_level(unsigned char *src, int length)
     for (i = 2112; i < 2148; i++)
       src[i] = src[i - 64];
   }
+#if 0
+  else if (length >= 2106)     /* !!! TEST ONLY: SHOW BROKEN LEVELS !!! */
+#else
   else if (length >= 2106 &&
           src[1983] == 116)
+#endif
   {
     /* ---------- this cave has V4 file format ---------- */
     file_version = FILE_VERSION_EM_V4;
@@ -156,10 +169,35 @@ int cleanup_em_level(unsigned char *src, int length)
     for (i = 2112; i < 2148; i++)
       src[i] = src[i - 64];
   }
+#if 1
+  else if (length >= 2106 &&
+          src[0] == 245 &&
+          src[1983] == 27)
+  {
+    unsigned char j = 94;
+
+    /* ---------- this cave has V3 file format ---------- */
+    file_version = FILE_VERSION_EM_V3;
+
+    for (i = 0; i < 2106; i++)
+      src[i] = (src[i] ^ (j += 7)) - 0x11;
+    src[1] = 131;
+    for (i = 0; i < 2048; i++)
+      src[i] = remap_v4[src[i]];
+    for (i = 2048; i < 2084; i++)
+      src[i] = remap_v4eater[src[i] >= 28 ? 0 : src[i]];
+    for (i = 2112; i < 2148; i++)
+      src[i] = src[i - 64];
+  }
+#endif
   else
   {
     /* ---------- this cave has unknown file format ---------- */
 
+#if 1
+    printf("::: %d, %d\n", src[0], src[1983]);
+#endif
+
     return 0;
   }
 
@@ -193,10 +231,27 @@ int cleanup_em_level(unsigned char *src, int length)
     if (src[i] == 40)
       src[i] = 147;
 
+#if 0
   /* fix acid */
   for (i = 64; i < 2048; i++)
-    if (src[i] == 63)
-      src[i - 64] = 101;
+    if (src[i] == 63)          /* replace element above 'Xacid_s' ... */
+      src[i - 64] = 101;       /* ... with 'Xacid_1' */
+
+#else
+
+  /* fix acid */
+  for (i = 64; i < 2048; i++)
+  {
+    if (src[i] == 63)          /* 'Xacid_s' (acid pool, bottom middle) */
+    {
+      if (file_version == FILE_VERSION_EM_V4 &&
+         i < 2048 - 64 && src[i + 64] == 63)
+       src[i - 64] = 255;      /* replace element above with 'Xfake_acid_1' */
+      else
+       src[i - 64] = 101;      /* replace element above with 'Xacid_1' */
+    }
+  }
+#endif
 
   /* fix acid in eater 1 */
   for (i = 2051; i < 2057; i++)
@@ -326,6 +381,10 @@ int cleanup_em_level(unsigned char *src, int length)
   /* size of v6 cave */
   length = 2172;
 
+#if 1
+  printf("::: EM level file version: %d\n", file_version);
+#endif
+
   return file_version;
 }
 
@@ -346,7 +405,8 @@ int cleanup_em_level(unsigned char *src, int length)
  *   rolls.
  * - a compile time option for rolling objects (stone, nut, spring, bomb) only
  *   in eater.
- * - acid is always deadly even with no base beneath it.
+ * - acid is always deadly even with no base beneath it (this breaks cave 0 in
+ *   downunder mine 16)
  *
  * so far all below have not broken any caves:
  *
@@ -379,51 +439,106 @@ int cleanup_em_level(unsigned char *src, int length)
 
 static unsigned short remap_emerald[256] =
 {
-  Xstone, Xstone, Xdiamond, Xdiamond, Xalien, Xalien, Xblank, Xblank,
-  Xtank_n, Xtank_e, Xtank_s, Xtank_w, Xtank_gon, Xtank_goe, Xtank_gos, Xtank_gow,
-  Xbomb, Xbomb, Xemerald, Xemerald, Xbug_n, Xbug_e, Xbug_s, Xbug_w,
-  Xbug_gon, Xbug_goe, Xbug_gos, Xbug_gow, Xdrip_eat, Xdrip_eat, Xdrip_eat, Xdrip_eat,
-  Xstone, Xbomb, Xdiamond, Xemerald, Xwonderwall, Xnut, Xnut, Xnut,
-  Xwheel, Xeater_n, Xeater_s, Xeater_w, Xeater_e, Xsand_stone, Xblank, Xblank,
-  Xblank, Xsand, Xsand, Xsand, Xsand_stone, Xsand_stone, Xsand_stone, Xsand,
-  Xstone, Xgrow_ew, Xgrow_ns, Xdynamite_1, Xdynamite_2, Xdynamite_3, Xdynamite_4, Xacid_s,
-  Xexit_1, Xexit_2, Xexit_3, Xballoon, Xplant, Xspring, Xspring, Xspring,
-  Xspring, Xball_1, Xball_2, Xandroid, Xblank, Xandroid, Xandroid, Xandroid,
-  Xandroid, Xandroid, Xandroid, Xandroid, Xandroid, Xblank, Xblank, Xblank,
-  Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xstone,              Xstone,         Xdiamond,       Xdiamond,
+  Xalien,              Xalien,         Xblank,         Xblank,
+  Xtank_n,             Xtank_e,        Xtank_s,        Xtank_w,
+  Xtank_gon,           Xtank_goe,      Xtank_gos,      Xtank_gow,
+
+  Xbomb,               Xbomb,          Xemerald,       Xemerald,
+  Xbug_n,              Xbug_e,         Xbug_s,         Xbug_w,
+  Xbug_gon,            Xbug_goe,       Xbug_gos,       Xbug_gow,
+  Xdrip_eat,           Xdrip_eat,      Xdrip_eat,      Xdrip_eat,
+
+  Xstone,              Xbomb,          Xdiamond,       Xemerald,
+  Xwonderwall,         Xnut,           Xnut,           Xnut,
+  Xwheel,              Xeater_n,       Xeater_s,       Xeater_w,
+  Xeater_e,            Xsand_stone,    Xblank,         Xblank,
+
+  Xblank,              Xsand,          Xsand,          Xsand,
+  Xsand_stone,         Xsand_stone,    Xsand_stone,    Xsand,
+  Xstone,              Xgrow_ew,       Xgrow_ns,       Xdynamite_1,
+  Xdynamite_2,         Xdynamite_3,    Xdynamite_4,    Xacid_s,
+
+  Xexit_1,             Xexit_2,        Xexit_3,        Xballoon,
+  Xplant,              Xspring,        Xspring,        Xspring,
+  Xspring,             Xball_1,        Xball_2,        Xandroid,
+  Xblank,              Xandroid,       Xandroid,       Xandroid,
+
+  Xandroid,            Xandroid,       Xandroid,       Xandroid,
+  Xandroid,            Xblank,         Xblank,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
 
 #ifdef BAD_ROLL
 
-  Xblank, Xblank, Xblank, Xspring_force_w, Xspring_force_e, Xacid_1, Xacid_2, Xacid_3,
-  Xacid_4, Xacid_5, Xacid_6, Xacid_7, Xacid_8, Xblank, Xblank, Xblank,
-  Xblank, Xblank, Xnut_force_w, Xnut_force_e, Xsteel_1, Xblank, Xblank, Xbomb_force_w,
-  Xbomb_force_e, Xstone_force_w, Xstone_force_e, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xblank,              Xblank,         Xblank,         Xspring_force_w,
+  Xspring_force_e,     Xacid_1,        Xacid_2,        Xacid_3,
+  Xacid_4,             Xacid_5,        Xacid_6,        Xacid_7,
+  Xacid_8,             Xblank,         Xblank,         Xblank,
+
+  Xblank,              Xblank,         Xnut_force_w,   Xnut_force_e,
+  Xsteel_1,            Xblank,         Xblank,         Xbomb_force_w,
+  Xbomb_force_e,       Xstone_force_w, Xstone_force_e, Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
 
 #else
 
-  Xblank, Xblank, Xblank, Xspring, Xspring, Xacid_1, Xacid_2, Xacid_3,
-  Xacid_4, Xacid_5, Xacid_6, Xacid_7, Xacid_8, Xblank, Xblank, Xblank,
-  Xblank, Xblank, Xnut, Xnut, Xsteel_1, Xblank, Xblank, Xbomb,
-  Xbomb, Xstone, Xstone, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xblank,              Xblank,         Xblank,         Xspring,
+  Xspring,             Xacid_1,        Xacid_2,        Xacid_3,
+  Xacid_4,             Xacid_5,        Xacid_6,        Xacid_7,
+  Xacid_8,             Xblank,         Xblank,         Xblank,
+
+  Xblank,              Xblank,         Xnut,           Xnut,
+  Xsteel_1,            Xblank,         Xblank,         Xbomb,
+  Xbomb,               Xstone,         Xstone,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
 
 #endif
 
-  Xblank, Xround_wall_1, Xgrass, Xsteel_1, Xwall_1, Xkey_1, Xkey_2, Xkey_3,
-  Xkey_4, Xdoor_1, Xdoor_2, Xdoor_3, Xdoor_4, Xdripper, Xfake_door_1, Xfake_door_2,
-  Xfake_door_3, Xfake_door_4, Xwonderwall, Xwheel, Xsand, Xacid_nw, Xacid_ne, Xacid_sw,
-  Xacid_se, Xfake_blank, Xamoeba_1, Xamoeba_2, Xamoeba_3, Xamoeba_4, Xexit, Xalpha_arrow_w,
-  Xfake_grass, Xlenses, Xmagnify, Xfake_blank, Xfake_grass, Xswitch, Xswitch, Xblank,
-  Xdecor_8, Xdecor_9, Xdecor_10, Xdecor_5, Xalpha_comma, Xalpha_quote, Xalpha_minus, Xdynamite,
-  Xsteel_3, Xdecor_6, Xdecor_7, Xsteel_2, Xround_wall_2, Xdecor_2, Xdecor_4, Xdecor_3,
-  Xwind_nesw, Xwind_e, Xwind_s, Xwind_w, Xwind_n, Xdirt, Xplant, Xkey_5,
-  Xkey_6, Xkey_7, Xkey_8, Xdoor_5, Xdoor_6, Xdoor_7, Xdoor_8, Xbumper,
-  Xalpha_a, Xalpha_b, Xalpha_c, Xalpha_d, Xalpha_e, Xalpha_f, Xalpha_g, Xalpha_h,
-  Xalpha_i, Xalpha_j, Xalpha_k, Xalpha_l, Xalpha_m, Xalpha_n, Xalpha_o, Xalpha_p,
-  Xalpha_q, Xalpha_r, Xalpha_s, Xalpha_t, Xalpha_u, Xalpha_v, Xalpha_w, Xalpha_x,
-  Xalpha_y, Xalpha_z, Xalpha_0, Xalpha_1, Xalpha_2, Xalpha_3, Xalpha_4, Xalpha_5,
-  Xalpha_6, Xalpha_7, Xalpha_8, Xalpha_9, Xalpha_perio, Xalpha_excla, Xalpha_colon, Xalpha_quest,
-  Xalpha_arrow_e, Xdecor_1, Xfake_door_5, Xfake_door_6, Xfake_door_7, Xfake_door_8, Xblank, Xblank,
-  Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank, Xblank,
+  Xblank,              Xround_wall_1,  Xgrass,         Xsteel_1,
+  Xwall_1,             Xkey_1,         Xkey_2,         Xkey_3,
+  Xkey_4,              Xdoor_1,        Xdoor_2,        Xdoor_3,
+  Xdoor_4,             Xdripper,       Xfake_door_1,   Xfake_door_2,
+
+  Xfake_door_3,                Xfake_door_4,   Xwonderwall,    Xwheel,
+  Xsand,               Xacid_nw,       Xacid_ne,       Xacid_sw,
+  Xacid_se,            Xfake_blank,    Xamoeba_1,      Xamoeba_2,
+  Xamoeba_3,           Xamoeba_4,      Xexit,          Xalpha_arrow_w,
+
+  Xfake_grass,         Xlenses,        Xmagnify,       Xfake_blank,
+  Xfake_grass,         Xswitch,        Xswitch,        Xblank,
+  Xdecor_8,            Xdecor_9,       Xdecor_10,      Xdecor_5,
+  Xalpha_comma,                Xalpha_quote,   Xalpha_minus,   Xdynamite,
+
+  Xsteel_3,            Xdecor_6,       Xdecor_7,       Xsteel_2,
+  Xround_wall_2,       Xdecor_2,       Xdecor_4,       Xdecor_3,
+  Xwind_nesw,          Xwind_e,        Xwind_s,        Xwind_w,
+  Xwind_n,             Xdirt,          Xplant,         Xkey_5,
+
+  Xkey_6,              Xkey_7,         Xkey_8,         Xdoor_5,
+  Xdoor_6,             Xdoor_7,        Xdoor_8,        Xbumper,
+  Xalpha_a,            Xalpha_b,       Xalpha_c,       Xalpha_d,
+  Xalpha_e,            Xalpha_f,       Xalpha_g,       Xalpha_h,
+
+  Xalpha_i,            Xalpha_j,       Xalpha_k,       Xalpha_l,
+  Xalpha_m,            Xalpha_n,       Xalpha_o,       Xalpha_p,
+  Xalpha_q,            Xalpha_r,       Xalpha_s,       Xalpha_t,
+  Xalpha_u,            Xalpha_v,       Xalpha_w,       Xalpha_x,
+
+  Xalpha_y,            Xalpha_z,       Xalpha_0,       Xalpha_1,
+  Xalpha_2,            Xalpha_3,       Xalpha_4,       Xalpha_5,
+  Xalpha_6,            Xalpha_7,       Xalpha_8,       Xalpha_9,
+  Xalpha_perio,                Xalpha_excla,   Xalpha_colon,   Xalpha_quest,
+
+  Xalpha_arrow_e,      Xdecor_1,       Xfake_door_5,   Xfake_door_6,
+  Xfake_door_7,                Xfake_door_8,   Xblank,         Xblank,
+  Xblank,              Xblank,         Xblank,         Xblank,
+#if 0
+  Xblank,              Xblank,         Xblank,         Xblank,
+#else
+  /* special elements added to solve compatibility problems */
+  Xblank,              Xblank,         Xblank,         Xfake_acid_1
+#endif
 };
 
 void convert_em_level(unsigned char *src, int file_version)
@@ -434,10 +549,17 @@ void convert_em_level(unsigned char *src, int file_version)
   };
   unsigned int i, x, y, temp;
 
+#if 1
+  lev.time_seconds = src[0x83E] << 8 | src[0x83F];
+  if (lev.time_seconds > 9999)
+    lev.time_seconds = 9999;
+#else
   temp = ((src[0x83E] << 8 | src[0x83F]) * 25 + 3) / 4;
   if (temp == 0 || temp > 9999)
     temp = 9999;
   lev.time_initial = temp;
+#endif
+
   lev.required_initial = src[0x82F];
 
   temp = src[0x830] << 8 | src[0x831];
@@ -779,7 +901,13 @@ void prepare_em_level(void)
     for (x = 0; x < WIDTH; x++)
       Draw[y][x] = Cave[y][x];
 
+#if 1
+  lev.time_initial = lev.time_seconds;
+#else
+  lev.time_initial = (lev.time_seconds * 50 + 7) / 8;
+#endif
   lev.time = lev.time_initial;
+
   lev.required = lev.required_initial;
   lev.score = 0;
 
@@ -808,6 +936,8 @@ void prepare_em_level(void)
 
   lev.home = lev.home_initial;
 
+  lev.killed_out_of_time = FALSE;
+
   ply1.num = 0;
   ply1.alive = ply1.alive_initial;
   ply1.dynamite = 0;
@@ -816,7 +946,9 @@ void prepare_em_level(void)
   ply1.anim = 0;
   ply1.oldx = ply1.x = ply1.x_initial;
   ply1.oldy = ply1.y = ply1.y_initial;
-  ply1.joy_n = ply1.joy_e = ply1.joy_s = ply1.joy_w = ply1.joy_fire = 0;
+  ply1.last_move_dir = MV_NO_MOVING;
+  ply1.joy_n = ply1.joy_e = ply1.joy_s = ply1.joy_w = 0;
+  ply1.joy_snap = ply1.joy_drop = 0;
   ply1.joy_stick = ply1.joy_spin = 0;
 
   ply2.num = 1;
@@ -827,6 +959,8 @@ void prepare_em_level(void)
   ply2.anim = 0;
   ply2.oldx = ply2.x = ply2.x_initial;
   ply2.oldy = ply2.y = ply2.y_initial;
-  ply2.joy_n = ply2.joy_e = ply2.joy_s = ply2.joy_w = ply2.joy_fire = 0;
+  ply2.last_move_dir = MV_NO_MOVING;
+  ply2.joy_n = ply2.joy_e = ply2.joy_s = ply2.joy_w = 0;
+  ply2.joy_snap = ply1.joy_drop = 0;
   ply2.joy_stick = ply2.joy_spin = 0;
 }
Rocks'n'Diamonds