From: Holger Schemel Date: Sat, 21 Jun 2003 05:56:52 +0000 (+0200) Subject: rnd-20030621-1-src X-Git-Tag: 3.0.0^2~41 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=5ec67e956f52fc441582d30b4748d44febdbeed6;p=rocksndiamonds.git rnd-20030621-1-src --- diff --git a/src/conftime.h b/src/conftime.h index 6b3c6c0e..dbf55932 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-06-20 01:43]" +#define COMPILE_DATE_STRING "[2003-06-20 18:24]" diff --git a/src/game.c b/src/game.c index 88f2c53c..4ea608c3 100644 --- a/src/game.c +++ b/src/game.c @@ -3791,7 +3791,16 @@ void ContinueMoving(int x, int y) int newx = x + dx, newy = y + dy; int step = (horiz_move ? dx : dy) * TILEX / MOVE_DELAY_NORMAL_SPEED; struct PlayerInfo *player = (IS_PLAYER(x, y) ? PLAYERINFO(x, y) : NULL); +#if 0 + boolean pushing = (player != NULL && player->Pushing && player->MovPos != 0); +#else boolean pushing = (player != NULL && player->Pushing && player->is_moving); +#endif + +#if 0 + if (player && player->is_moving && player->MovPos == 0) + printf("::: !!!\n"); +#endif if (element == EL_AMOEBA_DROP || element == EL_AMOEBA_DROPPING) step /= 2; @@ -3820,12 +3829,22 @@ void ContinueMoving(int x, int y) #if 1 if (pushing) /* special case: moving object pushed by player */ +#if 1 + MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos)); +#else MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->GfxPos)); #endif +#endif #if 0 - if (pushing) - printf("::: OOPS! pushing '%s'\n", element_info[element].token_name); + if (element == EL_SPRING) + printf("::: spring moves %d [%d: %d, %d, %d/%d]\n", + MovPos[x][y], + pushing, + (player?player->Pushing:-42), + (player?player->is_moving:-42), + (player?player->MovPos:-42), + (player?player->GfxPos:-42)); #endif if (ABS(MovPos[x][y]) >= TILEX) /* object reached its destination */ @@ -6817,11 +6836,13 @@ int DigField(struct PlayerInfo *player, FrameCounter, player->push_delay_value); #endif +#if 0 if (element == EL_SPRING) { Feld[x + dx][y + dy] = EL_SPRING; MovDir[x + dx][y + dy] = move_direction; } +#endif player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8));