From a5630af88e75de41d688577d88b47ca8bcfe63f6 Mon Sep 17 00:00:00 2001
From: Troye <woopstombraider@gmail.com>
Date: Wed, 4 Aug 2021 01:17:04 -0500
Subject: [PATCH] fix flare cancels (again); use LM_LHAND for torch NodeOffset;
 remove unused TES_extra_tab;

---
 TR5Main/Game/Lara/lara_fire.cpp  | 2 +-
 TR5Main/Game/Lara/lara_flare.cpp | 3 +--
 TR5Main/Game/effect2.cpp         | 7 +------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/TR5Main/Game/Lara/lara_fire.cpp b/TR5Main/Game/Lara/lara_fire.cpp
index ab0d87a2a..6cdaa1288 100644
--- a/TR5Main/Game/Lara/lara_fire.cpp
+++ b/TR5Main/Game/Lara/lara_fire.cpp
@@ -365,7 +365,7 @@ void LaraGun()
 
 			if (Lara.gunType == WEAPON_FLARE)
 			{
-				if (!Lara.leftArm.frameNumber)
+			//	if (!Lara.leftArm.frameNumber)	//NO
 				{
 					Lara.gunStatus = LG_UNDRAW_GUNS;
 				}
diff --git a/TR5Main/Game/Lara/lara_flare.cpp b/TR5Main/Game/Lara/lara_flare.cpp
index 182a1143d..e6bf92c8d 100644
--- a/TR5Main/Game/Lara/lara_flare.cpp
+++ b/TR5Main/Game/Lara/lara_flare.cpp
@@ -156,8 +156,7 @@ void undraw_flare()
 			Lara.flareFrame++;
 		}
 	}
-	else if (LaraItem->currentAnimState == LS_STOP 
-		&& Lara.Vehicle == NO_ITEM)
+	else if (LaraItem->animNumber == LA_DISCARD_FLARE)
 	{
 		LaraItem->animNumber = LA_STAND_SOLID;
 		LaraItem->frameNumber = g_Level.Anims[LaraItem->animNumber].frameBase;
diff --git a/TR5Main/Game/effect2.cpp b/TR5Main/Game/effect2.cpp
index 3c13a229f..462bd217a 100644
--- a/TR5Main/Game/effect2.cpp
+++ b/TR5Main/Game/effect2.cpp
@@ -22,11 +22,6 @@ using T5M::Effects::Explosion::TriggerExplosion;
 using namespace T5M::Effects::Spark;
 using namespace T5M::Math::Random;
 
-unsigned char TES_extra_tab[] =
-{
-	0x00, 0x04, 0x07, 0x0A, 0x00, 0x00
-};
-
 int NextSpark;
 int DeadlyBounds[6];
 SPLASH_SETUP SplashSetup;
@@ -42,7 +37,7 @@ int SplashCount = 0;
 
 PHD_VECTOR NodeVectors[MAX_NODE];
 NODEOFFSET_INFO NodeOffsets[MAX_NODE] = {
-	{ -16, 40, 160, -14, false }, // TR5 offset 0
+	{ -16, 40, 160, -LM_LHAND, false }, // TR5 offset 0
 	{ -16, -8, 160, 0, false }, // TR5 offset 1
 	{ 0, 0, 256, 8, false }, // TR5 offset 2
 	{ 0, 0, 256, 17, false }, // TR5 offset 3