rnd-20040320-1-src

* added move speed faster than "very fast" for custom elements
* fixed bug with 3+3 style explosions and missing border content
* fixed little bug when copying custom elements in the editor
* enhanced custom element changes by more side trigger actions

diff --git a/ChangeLog b/ChangeLog
index 21e28ba2d1b15bf274ccf4505413a48366670291..963d6af1ae3ecc119acdd97acc4c5cae3a4a2543 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2004-03-19
+       * added move speed faster than "very fast" for custom elements
+       * fixed bug with 3+3 style explosions and missing border content
+       * fixed little bug when copying custom elements in the editor
+       * enhanced custom element changes by more side trigger actions
+
 2004-03-16
        * added option "no scrolling when relocating" for instant teleporting
+       * uploaded pre-release (test) version 3.1.0-0 binary and source code
 
 2004-03-15
        * added trigger element and trigger player to use as target elements

diff --git a/Makefile b/Makefile
index 1ea92b071143a8f34b3ef39b687194fc893a8a00..481244f71d62f19aa28798e6d2579a159c37ac06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-DEFAULT_TARGET = x11
-# DEFAULT_TARGET = sdl
+# DEFAULT_TARGET = x11
+DEFAULT_TARGET = sdl
 
 
 # -----------------------------------------------------------------------------

diff --git a/src/Makefile b/src/Makefile
index ef1f52af1cd9b8b1be223b2036c4533f0076c8b3..f065f0b92cfb9a87ba2326f7db908e702e14b04a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -85,8 +85,7 @@ endif
 
 ifeq ($(TARGET),x11)
 SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
-# SYS_LDFLAGS = $(X11_LIBS) -lX11
-SYS_LDFLAGS = $(XLIB_PATH)/libX11.a
+SYS_LDFLAGS = $(X11_LIBS) -lX11
 endif
 
 ifeq ($(TARGET),sdl)

diff --git a/src/conftime.h b/src/conftime.h
index 5c96450b907d45b1741d616fb79a73aab07d3080..6993736d5f30296af5cf18cdc83d61106d65674e 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-03-19 22:55]"
+#define COMPILE_DATE_STRING "[2004-03-20 03:15]"

diff --git a/src/game.c b/src/game.c
index 5e5fe3ea5af646bd18f97feac68c7080dbb91366..ce08a48479e2cc22eebd169d580ab7871e839ebc 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -5333,11 +5333,30 @@ void StartMoving(int x, int y)
          {
            int flamed = MovingOrBlocked2Element(xx, yy);
 
+           /* !!! */
+#if 0
+           if (IS_CLASSIC_ENEMY(flamed) || CAN_EXPLODE_BY_DRAGONFIRE(flamed))
+             Bang(xx, yy);
+           else if (IS_MOVING(xx, yy) || IS_BLOCKED(xx, yy))
+             RemoveMovingField(xx, yy);
+           else
+             RemoveField(xx, yy);
+#else
            if (IS_CLASSIC_ENEMY(flamed) || CAN_EXPLODE_BY_DRAGONFIRE(flamed))
              Bang(xx, yy);
            else
              RemoveMovingField(xx, yy);
+#endif
+
+#if 0
+           if (ChangeDelay[xx][yy])
+             printf("::: !!! [%d]\n", (IS_MOVING(xx, yy) ||
+                                       Feld[xx][yy] == EL_BLOCKED));
+#endif
 
+#if 1
+           ChangeDelay[xx][yy] = 0;
+#endif
            Feld[xx][yy] = EL_FLAMES;
            if (IN_SCR_FIELD(sx, sy))
            {
@@ -5591,11 +5610,25 @@ void StartMoving(int x, int y)
 
          MovDelay[x][y] = 50;
 
+         /* !!! */
+#if 0
+         RemoveField(newx, newy);
+#endif
          Feld[newx][newy] = EL_FLAMES;
          if (IN_LEV_FIELD(newx1, newy1) && Feld[newx1][newy1] == EL_EMPTY)
+         {
+#if 0
+           RemoveField(newx1, newy1);
+#endif
            Feld[newx1][newy1] = EL_FLAMES;
+         }
          if (IN_LEV_FIELD(newx2, newy2) && Feld[newx2][newy2] == EL_EMPTY)
+         {
+#if 0
+           RemoveField(newx2, newy2);
+#endif
            Feld[newx2][newy2] = EL_FLAMES;
+         }
 
          return;
        }