From f47e4a3f4d332ee697fd638d7cbfc0c6d3e2c345 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Thu, 18 Oct 2007 02:12:30 +0200 Subject: [PATCH] rnd-20071018-1-src * fixed growing steel wall to leave steel wall instead of normal wall --- ChangeLog | 3 +++ Makefile | 2 +- src/conftime.h | 2 +- src/game.c | 2 +- src/screens.c | 7 +++++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58278f94..7896d422 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-10-18 + * fixed growing steel wall to leave steel wall instead of normal wall + 2007-10-09 * fixed nasty bug with auto-override and normal override not working on program startup (especially when current level set has custom artwork) diff --git a/Makefile b/Makefile index ea1154ef..d31608d9 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ CROSS_PATH_MSDOS = /usr/local/cross-msdos/i386-msdosdjgpp CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc # compile special edition of R'n'D instead of the normal (classic) version -SPECIAL_EDITION = rnd_jue +# SPECIAL_EDITION = rnd_jue # ----------------------------------------------------------------------------- diff --git a/src/conftime.h b/src/conftime.h index 62b5b85d..2116659d 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2007-10-12 21:15" +#define COMPILE_DATE_STRING "2007-10-18 02:09" diff --git a/src/game.c b/src/game.c index 708c0510..3992e533 100644 --- a/src/game.c +++ b/src/game.c @@ -9815,7 +9815,7 @@ void MauerAblegerStahl(int ax, int ay) element == EL_EXPANDABLE_STEELWALL_HORIZONTAL) && ((links_massiv && rechts_massiv) || element == EL_EXPANDABLE_STEELWALL_VERTICAL)) - Feld[ax][ay] = EL_WALL; + Feld[ax][ay] = EL_STEELWALL; if (new_wall) PlayLevelSoundAction(ax, ay, ACTION_GROWING); diff --git a/src/screens.c b/src/screens.c index 0d162f25..9b2a6ef9 100644 --- a/src/screens.c +++ b/src/screens.c @@ -4019,6 +4019,13 @@ static void execSetupSound() static void execSetupArtwork() { +#if 0 + printf("::: '%s', '%s', '%s'\n", + artwork.gfx_current->subdir, + artwork.gfx_current->fullpath, + artwork.gfx_current->basepath); +#endif + setup.graphics_set = artwork.gfx_current->identifier; setup.sounds_set = artwork.snd_current->identifier; setup.music_set = artwork.mus_current->identifier; -- 2.34.1