Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 16:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix flare cancels (again); use LM_LHAND for torch NodeOffset; remove unused TES_extra_tab;

Browse source
This commit is contained in:
Troye 2021-08-04 01:17:04 -05:00
parent 9456f91f98
commit a5630af88e
3 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Game/Lara/lara_fire.cpp
View file

@ -365,7 +365,7 @@ void LaraGun()
if (Lara.gunType == WEAPON_FLARE) if (Lara.gunType == WEAPON_FLARE)
{ {
if (!Lara.leftArm.frameNumber) // if (!Lara.leftArm.frameNumber) //NO
{ {
Lara.gunStatus = LG_UNDRAW_GUNS; Lara.gunStatus = LG_UNDRAW_GUNS;
} }

3
TR5Main/Game/Lara/lara_flare.cpp
View file

@ -156,8 +156,7 @@ void undraw_flare()
Lara.flareFrame++; Lara.flareFrame++;
} }
} }
else if (LaraItem->currentAnimState == LS_STOP else if (LaraItem->animNumber == LA_DISCARD_FLARE)
&& Lara.Vehicle == NO_ITEM)
{ {
LaraItem->animNumber = LA_STAND_SOLID; LaraItem->animNumber = LA_STAND_SOLID;
LaraItem->frameNumber = g_Level.Anims[LaraItem->animNumber].frameBase; LaraItem->frameNumber = g_Level.Anims[LaraItem->animNumber].frameBase;

7
TR5Main/Game/effect2.cpp
View file

@ -22,11 +22,6 @@ using T5M::Effects::Explosion::TriggerExplosion;
using namespace T5M::Effects::Spark; using namespace T5M::Effects::Spark;
using namespace T5M::Math::Random; using namespace T5M::Math::Random;
unsigned char TES_extra_tab[] =
{
0x00, 0x04, 0x07, 0x0A, 0x00, 0x00
};
int NextSpark; int NextSpark;
int DeadlyBounds[6]; int DeadlyBounds[6];
SPLASH_SETUP SplashSetup; SPLASH_SETUP SplashSetup;
@ -42,7 +37,7 @@ int SplashCount = 0;
PHD_VECTOR NodeVectors[MAX_NODE]; PHD_VECTOR NodeVectors[MAX_NODE];
NODEOFFSET_INFO NodeOffsets[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 { -16, -8, 160, 0, false }, // TR5 offset 1
{ 0, 0, 256, 8, false }, // TR5 offset 2 { 0, 0, 256, 8, false }, // TR5 offset 2
{ 0, 0, 256, 17, false }, // TR5 offset 3 { 0, 0, 256, 17, false }, // TR5 offset 3