Fixed ice sound after death

infval · Mar 24, 2019 · e3ec75adf308150c527fec62b087f794dbf3bb72 · e3ec75a
1 parent 9aead7c
commit e3ec75adf308150c527fec62b087f794dbf3bb72
Showing with 27 additions and 19 deletions.

+20 −18 collision.c

+1 −1 defs.h

+3 −0 gamelogic.c

+3 −0 history.txt
diff --git a/collision.c b/collision.c
@@ -225,26 +225,28 @@ u8 moveAvailableInWalls(_tank *tank) {
      || tile_idx == RES_TILE_ICE
      || (tank->ship == 1 && tile_idx == RES_TILE_RIVER)) i4 = TRUE;
 
-    u16 ice = FALSE;
-    if (
-        (r == 0 && (mapGetTile(x1, y1+1) == RES_TILE_ICE || mapGetTile(x2, y1+1) == RES_TILE_ICE))
-     || (r == 1 && (mapGetTile(x1+1, y2) == RES_TILE_ICE || mapGetTile(x1+1, y1) == RES_TILE_ICE))
-     || (r == 2 && (mapGetTile(x2, y2-1) == RES_TILE_ICE || mapGetTile(x1, y2-1) == RES_TILE_ICE))
-     || (r == 3 && (mapGetTile(x2-1, y2) == RES_TILE_ICE || mapGetTile(x2-1, y1) == RES_TILE_ICE))
-       ) {
-        ice = TRUE;
-    }
+    if (tank == &game_player[0] || tank == &game_player[1]) {
+        u16 ice = FALSE;
+        if (
+            (r == 0 && (mapGetTile(x1, y1+1) == RES_TILE_ICE || mapGetTile(x2, y1+1) == RES_TILE_ICE))
+         || (r == 1 && (mapGetTile(x1+1, y2) == RES_TILE_ICE || mapGetTile(x1+1, y1) == RES_TILE_ICE))
+         || (r == 2 && (mapGetTile(x2, y2-1) == RES_TILE_ICE || mapGetTile(x1, y2-1) == RES_TILE_ICE))
+         || (r == 3 && (mapGetTile(x2-1, y2) == RES_TILE_ICE || mapGetTile(x2-1, y1) == RES_TILE_ICE))
+        ) {
+            ice = TRUE;
+        }
 
-    tank->on_ice = FALSE;
-    if (ice && tank->speed == 0) {
-        tank->on_ice = TRUE;
-    }
+        tank->on_ice = FALSE;
+        if (ice && tank->speed == 0) {
+            tank->on_ice = TRUE;
+        }
 
-    if (ice && tank->speed) {
-        tank->ice = 32; // 28 ?
-    }
-    else if (!ice) {
-        tank->ice = 0;
+        if (ice && tank->speed) {
+            tank->ice = 32; // 28 ?
+        }
+        else if (!ice) {
+            tank->ice = 0;
+        }
     }
 
     if (i1 && i2 && i3 && i4)

diff --git a/defs.h b/defs.h
@@ -37,7 +37,7 @@
 #define BONUS_SHIP                  8
 
 #define GAME_VERSION                "1.08"
-#define GAME_BUILD                  "18"
+#define GAME_BUILD                  "19"
 
 
 // ================== GAME CONFIG ===================

diff --git a/gamelogic.c b/gamelogic.c
@@ -551,6 +551,9 @@ void GLog_initGamer(u8 player_idx) {
     game_player[player_idx].hp = 0;
     game_player[player_idx].bonus = 0;
 
+    game_player[player_idx].ice = 0;
+    game_player[player_idx].on_ice = FALSE;
+
     if (player_idx == 0) {
         game_player[player_idx].color = TANK_COLOR_YELLOW;
         game_player[player_idx].posx = START_X_PL_A << 3;

diff --git a/history.txt b/history.txt
@@ -38,6 +38,9 @@
 
 история:
 
+===== версия 1.08-19 =====
+- Был звук скольжения после смерти на льду.
+
 ===== версия 1.08-18 =====
 - Мод "увеличение врагов на карте" не сбрасывался на следующем уровне.
 - Оболочка врага у игрока появлялась и исчезала только после смерти. Подобранный игроком или врагом пистолет улучшал до танка с обычной оболочкой, несмотря на моды "игрок носит оболочку врага" и "враг носит оболочку игрока".