X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=1762651003cd65ab3995e546b484237d09f5f997;hp=2bc7d4fe9c000c06b4b429559be9aded895a52cc;hb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;hpb=476df02707a263f71b8b91f7c6947e8033d20f5e diff --git a/src/tools.c b/src/tools.c index 2bc7d4fe..17626510 100644 --- a/src/tools.c +++ b/src/tools.c @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // tools.c // ============================================================================ @@ -291,8 +291,6 @@ static int getLevelFromScreenX_EM(int sx) int px = sx - SX; int lx = LEVELX((px + dx) / TILESIZE_VAR); - lx = correctLevelPosX_EM(lx); - return lx; } @@ -308,8 +306,6 @@ static int getLevelFromScreenY_EM(int sy) int py = sy - SY; int ly = LEVELY((py + dy) / TILESIZE_VAR); - ly = correctLevelPosY_EM(ly); - return ly; } @@ -6539,12 +6535,12 @@ em_object_mapping_list[GAME_TILE_MAX + 1] = EL_SPRING, -1, -1 }, { - Xspring_e, FALSE, FALSE, - EL_SPRING, -1, -1 + Xspring_e, TRUE, FALSE, + EL_SPRING_RIGHT, -1, -1 }, { - Xspring_w, FALSE, FALSE, - EL_SPRING, -1, -1 + Xspring_w, TRUE, FALSE, + EL_SPRING_LEFT, -1, -1 }, { Xspring_fall, FALSE, FALSE, @@ -6633,11 +6629,11 @@ em_object_mapping_list[GAME_TILE_MAX + 1] = }, { Xpush_spring_e, FALSE, FALSE, - EL_SPRING, -1, MV_BIT_RIGHT + EL_SPRING_RIGHT, -1, MV_BIT_RIGHT }, { Xpush_spring_w, FALSE, FALSE, - EL_SPRING, -1, MV_BIT_LEFT + EL_SPRING_LEFT, -1, MV_BIT_LEFT }, { @@ -6856,11 +6852,11 @@ em_object_mapping_list[GAME_TILE_MAX + 1] = }, { - Xdrip, FALSE, FALSE, + Xdrip, TRUE, FALSE, EL_AMOEBA_DROP, ACTION_GROWING, -1 }, { - Xdrip_fall, TRUE, FALSE, + Xdrip_fall, FALSE, FALSE, EL_AMOEBA_DROP, -1, -1 }, {