Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

creature: move Creature_IsAlly to trx

Browse source
This commit is contained in:
Marcin Kurczewski 2025-04-08 23:28:20 +02:00
parent c324d486d3
commit 2cd7f04a1e
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libtrx/game/creature/common.c
View file

@ -1100,6 +1100,11 @@ bool Creature_IsHostile(const ITEM *const item)
|| (Creature_AreAlliesHostile() && Creature_IsAlly(item));
}
bool Creature_IsAlly(const ITEM *const item)
{
return Object_IsType(item->object_id, g_AllyObjects);
}
int16_t Creature_Effect(
const ITEM *const item, const BITE *const bite,
int16_t (*const spawn)(

2
src/libtrx/include/libtrx/game/creature/common.h
View file

@ -32,7 +32,7 @@ int32_t Creature_Vault(
bool Creature_AreAlliesHostile(void);
void Creature_SetAlliesHostile(bool enable);
bool Creature_IsHostile(const ITEM *item);
extern bool Creature_IsAlly(const ITEM *item);
bool Creature_IsAlly(const ITEM *item);
int16_t Creature_Effect(
const ITEM *item, const BITE *bite,

5
src/tr1/game/creature.c
View file

@ -55,8 +55,3 @@ bool Creature_IsBoss(const int16_t item_num)
const ITEM *const item = Item_Get(item_num);
return Object_IsType(item->object_id, g_BossObjects);
}
bool Creature_IsAlly(const ITEM *const item)
{
return Object_IsType(item->object_id, g_AllyObjects);
}

5
src/tr2/game/creature.c
View file

@ -24,11 +24,6 @@
#define M_SHOOT_TARGETING_SPEED 300
#define M_SHOOT_HIT_CHANCE 0x2000
bool Creature_IsAlly(const ITEM *const item)
{
return Object_IsType(item->object_id, g_AllyObjects);
}
int32_t Creature_ShootAtLara(
ITEM *const item, const AI_INFO *const info, const BITE *const gun,
const int16_t extra_rotation, const int32_t damage)