rnd-20060403-1-src

* changed EM engine behaviour back to re-allow initial rolling springs

diff --git a/ChangeLog b/ChangeLog
index 33a18543d4d648ab0adc76c1e5a796ce070520d9..f4a12b5e77db6ddc32f38f5729dfc15e05f305db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-04-03
+       * changed EM engine behaviour back to re-allow initial rolling springs
+
 2006-04-02
        * fixed handling of over-large selectboxes (less error-prone now)
        * fixed bug when creating GE with walkable element under the player
@@ -48,6 +51,7 @@
 
 2006-03-10
        * added four new yam yams with explicit start direction for EMC engine
+       * fixed bug in src/libgame/text.c with printing text outside the window
 
 2006-03-09
        * fixed small bug in EMC level loader (copyright sign in EM II levels)

diff --git a/src/conftime.h b/src/conftime.h
index dfbc5f2c584997825d330a24c9a6c4e48bf3a69d..91a627240c0106c389843b9313def8bc7a33859e 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-04-02 20:00]"
+#define COMPILE_DATE_STRING "[2006-04-03 00:22]"

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index 07c18a051259607a6e7bfdfebf56ed521ace2f44..bea631b5baeb7b8d7f265c0755b0a1817f5cc8de 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -11,6 +11,8 @@
 #include "main_em.h"
 
 
+#define ALLOW_ROLLING_SPRING
+
 static unsigned char remap_v6[256] =
 {
   /* filter crap for v6 */
@@ -20,7 +22,11 @@ static unsigned char remap_v6[256] =
   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,
 
+#ifdef ALLOW_ROLLING_SPRING
+  64,65,66,67,     68,69,69,71,     72,73,74,75,     118,75,75,75,
+#else
   64,65,66,67,     68,69,69,69,     69,73,74,75,     118,75,75,75,
+#endif
   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,
@@ -439,6 +445,11 @@ int cleanup_em_level(unsigned char *src, int length)
  * - rolling spring is now turned into regular spring. it appears the emc
  *   editor only uses the force code for initially moving spring. i will
  *   follow this in my editor.
+ *
+ * 2006-04-02
+ * - introduced ALLOW_ROLLING_SPRING; if defined, do NOT turn rolling spring
+ *   into regular spring, because this breaks at least E.M.C. Mine 3, level 79
+ *   (see comment directly above)
  */
 
 static unsigned short remap_emerald[256] =
@@ -463,10 +474,17 @@ static unsigned short remap_emerald[256] =
   Xstone,              Xgrow_ew,       Xgrow_ns,       Xdynamite_1,
   Xdynamite_2,         Xdynamite_3,    Xdynamite_4,    Xacid_s,
 
+#ifdef ALLOW_ROLLING_SPRING
+  Xexit_1,             Xexit_2,        Xexit_3,        Xballoon,
+  Xplant,              Xspring,        Xspring_fall,   Xspring_w,
+  Xspring_e,           Xball_1,        Xball_2,        Xandroid,
+  Xblank,              Xandroid,       Xandroid,       Xandroid,
+#else
   Xexit_1,             Xexit_2,        Xexit_3,        Xballoon,
   Xplant,              Xspring,        Xspring,        Xspring,
   Xspring,             Xball_1,        Xball_2,        Xandroid,
   Xblank,              Xandroid,       Xandroid,       Xandroid,
+#endif
 
   Xandroid,            Xandroid,       Xandroid,       Xandroid,
   Xandroid,            Xblank,         Xblank,         Xblank,