From fd07189b54e849959b3415ce3d5d42e272ba8542 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 20 Mar 2004 11:13:51 +0100 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ Makefile | 4 ++-- src/Makefile | 3 +-- src/conftime.h | 2 +- src/game.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21e28ba2..963d6af1 100644 --- 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 1ea92b07..481244f7 100644 --- 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 ef1f52af..f065f0b9 100644 --- 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 5c96450b..6993736d 100644 --- 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 5e5fe3ea..ce08a484 100644 --- 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; } -- 2.34.1