From: Holger Schemel <info@artsoft.org>
Date: Sun, 2 Apr 2006 22:28:39 +0000 (+0200)
Subject: rnd-20060403-1-src
X-Git-Tag: 3.2.0^2~36
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=36b674d2aef8799197255218ef893857f49cff18;p=rocksndiamonds.git

rnd-20060403-1-src
* changed EM engine behaviour back to re-allow initial rolling springs
---

diff --git a/ChangeLog b/ChangeLog
index 33a18543..f4a12b5e 100644
--- 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 dfbc5f2c..91a62724 100644
--- 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 07c18a05..bea631b5 100644
--- 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,