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

Fix merge

Browse source
This commit is contained in:
Lwmte 2021-09-20 01:11:22 +03:00
parent e70b87ca90
commit b11a8ad77c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TR5Main/Game/collide.cpp
View file

@ -2599,7 +2599,7 @@ void GenericSphereBoxCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll)
int y = l->pos.yPos;
int z = l->pos.zPos;
if (ItemPushItem(item, l, coll, ((deadlyBits & 1) & coll->Setup.EnableSpaz), 3) && (deadlyBits & 1))
if (ItemPushItem(item, l, coll, deadlyBits & 1, 3) && (deadlyBits & 1))
{
l->hitPoints -= item->itemFlags[3];

2
TR5Main/Game/people.cpp
View file

@ -124,7 +124,7 @@ int Targetable(ITEM_INFO* item, AI_INFO* info)
if (enemy == NULL || enemy->hitPoints <= 0 || !info->ahead || info->distance >= SQUARE(MAX_VISIBILITY_DISTANCE))
return 0;
if (!enemy->data.is<CREATURE_INFO>() && !enemy->data.is<LaraInfo>())
if (!enemy->data.is<CREATURE_INFO>() && !enemy->data.is<LaraInfo*>())
return 0;
GAME_VECTOR start, target;