From: Holger Schemel Date: Mon, 22 Jan 2001 21:28:40 +0000 (+0100) Subject: rnd-20010122-3-src X-Git-Tag: 2.0.1^2~20 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=c67c3097b43d753268773d85261c02a9ded95129;p=rocksndiamonds.git rnd-20010122-3-src --- diff --git a/src/game.c b/src/game.c index 2a17a15f..a4940d96 100644 --- a/src/game.c +++ b/src/game.c @@ -4250,6 +4250,8 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action) SnapField(player, 0, 0); CheckGravityMovement(player); + player->last_move_dir = MV_NO_MOVING; + if (++player->frame_reset_delay > player->move_delay_value) player->Frame = 0; } @@ -5238,7 +5240,9 @@ void TestIfBadThingHitsGoodThing(int badx, int bady) { struct PlayerInfo *player = PLAYERINFO(killx, killy); - if (player->shield_active_time_left > 0) + if (Feld[badx][bady] == EL_ROBOT && player->last_move_dir) + ; /* robot does not kill player if he moves */ + else if (player->shield_active_time_left > 0) Bang(badx, bady); else if (!PLAYER_PROTECTED(killx, killy)) KillHero(player);