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

Cleanup collide.cpp a bit more

Browse source
This commit is contained in:
Lwmte 2021-08-26 14:58:06 +03:00
parent 465d282123
commit 4d42bbeee5
2 changed files with 25 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

46
TR5Main/Game/collide.cpp
View file

@ -16,26 +16,6 @@ using std::vector;
using namespace ten::Math::Random; using namespace ten::Math::Random;
using namespace ten::Floordata; 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; BOUNDING_BOX GlobalCollisionBounds;
ITEM_INFO* CollidedItems[MAX_COLLIDED_OBJECTS]; ITEM_INFO* CollidedItems[MAX_COLLIDED_OBJECTS];
MESH_INFO* CollidedMeshes[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; Lara.hitDirection = (l->pos.yRot - phd_atan(dz, dz) - ANGLE(135)) / 16384;
static int hitSoundTimer = 0;
if ((!Lara.hitFrame) && (!hitSoundTimer)) if ((!Lara.hitFrame) && (!hitSoundTimer))
{ {
SoundEffect(SFX_TR4_LARA_INJURY, &l->pos, 0); SoundEffect(SFX_TR4_LARA_INJURY, &l->pos, 0);
hitSoundTimer = generateFloat(5, 15); hitSoundTimer = generateFloat(15, 35);
} }
if (hitSoundTimer) 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; 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 TestLaraPosition(OBJECT_COLLISION_BOUNDS* bounds, ITEM_INFO* item, ITEM_INFO* l)
{ {
int x, y, z, rx, ry, rz; int x, y, z, rx, ry, rz;

22
TR5Main/Game/effect.cpp
View file

@ -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 void ControlWaterfallMist(short itemNumber) // ControlWaterfallMist
{ {
ITEM_INFO* item = &g_Level.Items[itemNumber]; ITEM_INFO* item = &g_Level.Items[itemNumber];