From 2c04b225c17d2876b9bbaced44329ea37ceefc97 Mon Sep 17 00:00:00 2001
From: Lwmte <initiator@nm.ru>
Date: Thu, 26 Aug 2021 14:58:06 +0300
Subject: [PATCH] Cleanup collide.cpp a bit more

---
 TR5Main/Game/collide.cpp | 46 +++-------------------------------------
 TR5Main/Game/effect.cpp  | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp
index d6ffb3642..26bf504cf 100644
--- a/TR5Main/Game/collide.cpp
+++ b/TR5Main/Game/collide.cpp
@@ -16,26 +16,6 @@ using std::vector;
 using namespace ten::Math::Random;
 using namespace ten::Floordata;
 
-char LM[] =
-{
-	LM_HIPS,
-	LM_LTHIGH,
-	LM_LSHIN,
-	LM_LFOOT,
-	LM_RTHIGH,
-	LM_RSHIN,
-	LM_RFOOT,
-	LM_TORSO,
-	LM_RINARM,
-	LM_ROUTARM,
-	LM_RHAND,
-	LM_LINARM,
-	LM_LOUTARM,
-	LM_LHAND,
-	LM_HEAD,
-};
-
-int hitSoundTimer;
 BOUNDING_BOX GlobalCollisionBounds;
 ITEM_INFO* CollidedItems[MAX_COLLIDED_OBJECTS];
 MESH_INFO* CollidedMeshes[MAX_COLLIDED_OBJECTS];
@@ -563,10 +543,12 @@ int ItemPushLara(ITEM_INFO* item, ITEM_INFO* l, COLL_INFO* coll, int spazon, cha
 
 		Lara.hitDirection = (l->pos.yRot - phd_atan(dz, dz) - ANGLE(135)) / 16384;
 
+		static int hitSoundTimer = 0;
+
 		if ((!Lara.hitFrame) && (!hitSoundTimer))
 		{
 				SoundEffect(SFX_TR4_LARA_INJURY, &l->pos, 0);
-				hitSoundTimer = generateFloat(5, 15);
+				hitSoundTimer = generateFloat(15, 35);
 		}
 
 		if (hitSoundTimer)
@@ -661,28 +643,6 @@ void AlignLaraPosition(PHD_VECTOR* vec, ITEM_INFO* item, ITEM_INFO* l)
 	l->pos.zPos = item->pos.zPos + pos.z;
 }
 
-void TriggerLaraBlood() 
-{
-	int i;
-	int node = 1;
-
-	for (i = 0; i < 14; i++)
-	{
-		if (node & LaraItem->touchBits)
-		{
-			PHD_VECTOR vec;
-			vec.x = (GetRandomControl() & 31) - 16;
-			vec.y = (GetRandomControl() & 31) - 16;
-			vec.z = (GetRandomControl() & 31) - 16;
-
-			GetLaraJointPosition(&vec, LM[i]);
-			DoBloodSplat(vec.x, vec.y, vec.z, (GetRandomControl() & 7) + 8, 2 * GetRandomControl(), LaraItem->roomNumber);
-		}
-
-		node *= 2;
-	}
-}
-
 int TestLaraPosition(OBJECT_COLLISION_BOUNDS* bounds, ITEM_INFO* item, ITEM_INFO* l)
 {
 	int x, y, z, rx, ry, rz;
diff --git a/TR5Main/Game/effect.cpp b/TR5Main/Game/effect.cpp
index 1971c3c88..fde9b32fd 100644
--- a/TR5Main/Game/effect.cpp
+++ b/TR5Main/Game/effect.cpp
@@ -333,6 +333,28 @@ void void_effect(ITEM_INFO* item)
 
 }
 
+void TriggerLaraBlood()
+{
+	int i;
+	int node = 1;
+
+	for (i = 0; i <= LARA_MESHES::NUM_LARA_MESHES; i++)
+	{
+		if (node & LaraItem->touchBits)
+		{
+			PHD_VECTOR vec;
+			vec.x = (GetRandomControl() & 31) - 16;
+			vec.y = (GetRandomControl() & 31) - 16;
+			vec.z = (GetRandomControl() & 31) - 16;
+
+			GetLaraJointPosition(&vec, (LARA_MESHES)i);
+			DoBloodSplat(vec.x, vec.y, vec.z, (GetRandomControl() & 7) + 8, 2 * GetRandomControl(), LaraItem->roomNumber);
+		}
+
+		node *= 2;
+	}
+}
+
 void ControlWaterfallMist(short itemNumber) // ControlWaterfallMist
 {
 	ITEM_INFO* item = &g_Level.Items[itemNumber];