From: Holger Schemel Date: Thu, 18 Oct 2007 00:40:02 +0000 (+0200) Subject: rnd-20071018-2-src X-Git-Tag: 3.2.6.0^2~30 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=1d32d46e52cc55720c4f191436514aca4a579e94;p=rocksndiamonds.git rnd-20071018-2-src --- diff --git a/ChangeLog b/ChangeLog index 7896d422..72d8cd60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-10-18 - * fixed growing steel wall to leave steel wall instead of normal wall + * fixed growing steel wall to also leave behind steel wall instead of + normal, destructible wall + * fixed handling of rocks falling through stacks of quicksand with + different speed (before, the rocks just got stuck in the quicksand) 2007-10-09 * fixed nasty bug with auto-override and normal override not working on diff --git a/src/conftime.h b/src/conftime.h index 2116659d..8a9e3345 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2007-10-18 02:09" +#define COMPILE_DATE_STRING "2007-10-18 02:23" diff --git a/src/game.c b/src/game.c index 3992e533..55020d92 100644 --- a/src/game.c +++ b/src/game.c @@ -7587,6 +7587,33 @@ void StartMoving(int x, int y) Store[x][y + 1] = Store[x][y]; Store[x][y] = 0; + PlayLevelSoundAction(x, y, ACTION_FILLING); + } + else if (Feld[x][y + 1] == EL_QUICKSAND_FAST_EMPTY) + { + if (!MovDelay[x][y]) + { + MovDelay[x][y] = TILEY + 1; + + ResetGfxAnimation(x, y); + ResetGfxAnimation(x, y + 1); + } + + if (MovDelay[x][y]) + { + DrawLevelElement(x, y, EL_QUICKSAND_EMPTYING); + DrawLevelElement(x, y + 1, EL_QUICKSAND_FAST_FILLING); + + MovDelay[x][y]--; + if (MovDelay[x][y]) + return; + } + + Feld[x][y] = EL_QUICKSAND_EMPTY; + Feld[x][y + 1] = EL_QUICKSAND_FAST_FULL; + Store[x][y + 1] = Store[x][y]; + Store[x][y] = 0; + PlayLevelSoundAction(x, y, ACTION_FILLING); } } @@ -7632,6 +7659,33 @@ void StartMoving(int x, int y) Store[x][y + 1] = Store[x][y]; Store[x][y] = 0; + PlayLevelSoundAction(x, y, ACTION_FILLING); + } + else if (Feld[x][y + 1] == EL_QUICKSAND_EMPTY) + { + if (!MovDelay[x][y]) + { + MovDelay[x][y] = TILEY + 1; + + ResetGfxAnimation(x, y); + ResetGfxAnimation(x, y + 1); + } + + if (MovDelay[x][y]) + { + DrawLevelElement(x, y, EL_QUICKSAND_FAST_EMPTYING); + DrawLevelElement(x, y + 1, EL_QUICKSAND_FILLING); + + MovDelay[x][y]--; + if (MovDelay[x][y]) + return; + } + + Feld[x][y] = EL_QUICKSAND_FAST_EMPTY; + Feld[x][y + 1] = EL_QUICKSAND_FULL; + Store[x][y + 1] = Store[x][y]; + Store[x][y] = 0; + PlayLevelSoundAction(x, y, ACTION_FILLING); } }