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

creature: rename Creature_IsEnemy to Creature_IsHostile

Browse source
This commit is contained in:
Marcin Kurczewski 2025-01-19 01:07:38 +01:00
parent 7746759add
commit c4de5bd017
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libtrx/game/console/cmd/kill.c
View file

@ -36,7 +36,7 @@ static bool M_KillSingleEnemyInRange(const int32_t max_dist)
int16_t best_item_num = NO_ITEM; int16_t best_item_num = NO_ITEM;
for (int16_t item_num = 0; item_num < Item_GetTotalCount(); item_num++) { for (int16_t item_num = 0; item_num < Item_GetTotalCount(); item_num++) {
const ITEM *const item = Item_Get(item_num); const ITEM *const item = Item_Get(item_num);
if (Creature_IsEnemy(item)) { if (Creature_IsHostile(item)) {
const int32_t dist = Item_GetDistance(item, &lara_item->pos); const int32_t dist = Item_GetDistance(item, &lara_item->pos);
if (dist <= max_dist) { if (dist <= max_dist) {
if (best_item_num == NO_ITEM || dist < best_dist) { if (best_item_num == NO_ITEM || dist < best_dist) {
@ -60,7 +60,7 @@ static int32_t M_KillAllEnemiesInRange(const int32_t max_dist)
const ITEM *const lara_item = Lara_GetItem(); const ITEM *const lara_item = Lara_GetItem();
for (int16_t item_num = 0; item_num < Item_GetTotalCount(); item_num++) { for (int16_t item_num = 0; item_num < Item_GetTotalCount(); item_num++) {
const ITEM *const item = Item_Get(item_num); const ITEM *const item = Item_Get(item_num);
if (Creature_IsEnemy(item)) { if (Creature_IsHostile(item)) {
const int32_t dist = Item_GetDistance(item, &lara_item->pos); const int32_t dist = Item_GetDistance(item, &lara_item->pos);
if (dist <= max_dist) { if (dist <= max_dist) {
// Kill this enemy // Kill this enemy
@ -78,7 +78,7 @@ static COMMAND_RESULT M_KillAllEnemies(void)
int32_t num_killed = 0; int32_t num_killed = 0;
for (int16_t item_num = 0; item_num < Item_GetTotalCount(); item_num++) { for (int16_t item_num = 0; item_num < Item_GetTotalCount(); item_num++) {
const ITEM *const item = Item_Get(item_num); const ITEM *const item = Item_Get(item_num);
if (!Creature_IsEnemy(item)) { if (!Creature_IsHostile(item)) {
continue; continue;
} }
if (Lara_Cheat_KillEnemy(item_num)) { if (Lara_Cheat_KillEnemy(item_num)) {

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

@ -27,4 +27,4 @@ typedef struct {
#endif #endif
} CREATURE; } CREATURE;
bool Creature_IsEnemy(const ITEM *item); bool Creature_IsHostile(const ITEM *item);

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

@ -819,7 +819,7 @@ static bool M_TestSwitchOrKill(
return false; return false;
} }
bool Creature_IsEnemy(const ITEM *const item) bool Creature_IsHostile(const ITEM *const item)
{ {
return Object_IsObjectType(item->object_id, g_EnemyObjects); return Object_IsObjectType(item->object_id, g_EnemyObjects);
} }

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

@ -942,7 +942,7 @@ int32_t Creature_CanTargetEnemy(
return LOS_Check(&start, &target); return LOS_Check(&start, &target);
} }
bool Creature_IsEnemy(const ITEM *const item) bool Creature_IsHostile(const ITEM *const item)
{ {
return Object_IsObjectType(item->object_id, g_EnemyObjects) return Object_IsObjectType(item->object_id, g_EnemyObjects)
|| (g_IsMonkAngry || (g_IsMonkAngry

2
src/tr2/game/creature.h
View file

@ -29,7 +29,7 @@ void Creature_Kill(
void Creature_GetBaddieTarget(int16_t item_num, int32_t goody); void Creature_GetBaddieTarget(int16_t item_num, int32_t goody);
void Creature_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); void Creature_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll);
int32_t Creature_CanTargetEnemy(const ITEM *item, const AI_INFO *info); int32_t Creature_CanTargetEnemy(const ITEM *item, const AI_INFO *info);
bool Creature_IsEnemy(const ITEM *item); bool Creature_IsHostile(const ITEM *item);
bool Creature_IsAlly(const ITEM *item); bool Creature_IsAlly(const ITEM *item);
int32_t Creature_ShootAtLara( int32_t Creature_ShootAtLara(
ITEM *item, const AI_INFO *info, const BITE *gun, int16_t extra_rotation, ITEM *item, const AI_INFO *info, const BITE *gun, int16_t extra_rotation,