grenade: fix grenades counting as double hits and kills

Resolves LostArtefacts#1560.
walkawayy · Oct 27, 2024 · 9615779 · 9615779
1 parent 535a502
commit 9615779
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
@@ -14,6 +14,7 @@
 - fixed Lara's underwater hue being retained when re-entering a boat (#1596)
 - fixed Lara reloading the harpoon gun after every shot in NG+ (#1575)
 - fixed the dragon reviving itself after Lara removes the dagger in rare circumstances (#1572)
+- fixed grenades counting as double hits and kills in the game statistics (#1560)
 
 ## [0.5](https://github.com/LostArtefacts/TRX/compare/afaf12a...tr2-0.5) - 2024-10-08
 - added `/sfx` command

diff --git a/docs/tr2/README.md b/docs/tr2/README.md
@@ -30,6 +30,7 @@ decompilation process. We recognize that there is much work to be done.
 - fixed the distorted skybox in room 5 of Barkhang Monastery
 - fixed Lara reloading the harpoon gun after every shot in NG+
 - fixed the dragon reviving itself after Lara removes the dagger in rare circumstances
+- fixed grenades counting as double hits and kills in the game statistics
 
 #### Visuals
 

diff --git a/src/tr2/game/objects/general/grenade.c b/src/tr2/game/objects/general/grenade.c
@@ -119,17 +119,7 @@ void __cdecl Grenade_Control(int16_t item_num)
         } else {
             // XXX: missing check if obj is intelligent?
             Gun_HitTarget(target_item, NULL, 30);
-
             explode = true;
-            g_SaveGame.statistics.hits++;
-
-            if (target_item->hit_points <= 0) {
-                g_SaveGame.statistics.kills++;
-                if (target_item->object_id != O_DRAGON_FRONT
-                    && target_item->object_id != O_GIANT_YETI) {
-                    Creature_Die(target_item_num, true);
-                }
-            }
         }
     }