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_Vault to trx

Browse source
This commit is contained in:
Marcin Kurczewski 2025-04-08 23:06:58 +02:00
parent 3959fdb35a
commit 81c570a61c
4 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -916,6 +916,63 @@ void Creature_Die(const int16_t item_num, const bool explode)
#endif
}
int32_t Creature_Vault(
const int16_t item_num, const int16_t angle, int32_t vault,
const int32_t shift)
{
ITEM *const item = Item_Get(item_num);
const int16_t room_num = item->room_num;
const XYZ_32 old = item->pos;
Creature_Animate(item_num, angle, 0);
if (item->floor > old.y + STEP_L * 7 / 2) {
vault = -4;
} else if (item->pos.y > old.y - STEP_L * 3 / 2) {
return 0;
} else if (item->pos.y > old.y - STEP_L * 5 / 2) {
vault = 2;
} else if (item->pos.y > old.y - STEP_L * 7 / 2) {
vault = 3;
} else {
vault = 4;
}
const int32_t old_x_sector = old.x >> WALL_SHIFT;
const int32_t old_z_sector = old.z >> WALL_SHIFT;
const int32_t x_sector = item->pos.x >> WALL_SHIFT;
const int32_t z_sector = item->pos.z >> WALL_SHIFT;
if (old_z_sector == z_sector) {
if (old_x_sector == x_sector) {
return 0;
}
if (old_x_sector >= x_sector) {
item->rot.y = -DEG_90;
item->pos.x = (old_x_sector << WALL_SHIFT) + shift;
} else {
item->rot.y = DEG_90;
item->pos.x = (x_sector << WALL_SHIFT) - shift;
}
} else if (old_x_sector == x_sector) {
if (old_z_sector >= z_sector) {
item->rot.y = -DEG_180;
item->pos.z = (old_z_sector << WALL_SHIFT) + shift;
} else {
item->rot.y = 0;
item->pos.z = (z_sector << WALL_SHIFT) - shift;
}
}
item->floor = old.y;
item->pos.y = old.y;
if (room_num != item->room_num) {
Item_NewRoom(item_num, room_num);
}
return vault;
}
int16_t Creature_Effect(
const ITEM *const item, const BITE *const bite,
int16_t (*const spawn)(

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

@ -22,7 +22,10 @@ bool Creature_CanTargetEnemy(const ITEM *item, const AI_INFO *info);
bool Creature_CheckBaddieOverlap(int16_t item_num);
void Creature_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll);
bool Creature_Animate(int16_t item_num, int16_t angle, int16_t tilt);
void Creature_Die(int16_t item_num, bool explode);
int32_t Creature_Vault(
int16_t item_num, int16_t angle, int32_t vault, int32_t shift);
extern bool Creature_IsHostile(const ITEM *item);

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

@ -25,63 +25,6 @@
#define M_SHOOT_TARGETING_SPEED 300
#define M_SHOOT_HIT_CHANCE 0x2000
int32_t Creature_Vault(
const int16_t item_num, const int16_t angle, int32_t vault,
const int32_t shift)
{
ITEM *const item = Item_Get(item_num);
const int16_t room_num = item->room_num;
const XYZ_32 old = item->pos;
Creature_Animate(item_num, angle, 0);
if (item->floor > old.y + STEP_L * 7 / 2) {
vault = -4;
} else if (item->pos.y > old.y - STEP_L * 3 / 2) {
return 0;
} else if (item->pos.y > old.y - STEP_L * 5 / 2) {
vault = 2;
} else if (item->pos.y > old.y - STEP_L * 7 / 2) {
vault = 3;
} else {
vault = 4;
}
const int32_t old_x_sector = old.x >> WALL_SHIFT;
const int32_t old_z_sector = old.z >> WALL_SHIFT;
const int32_t x_sector = item->pos.x >> WALL_SHIFT;
const int32_t z_sector = item->pos.z >> WALL_SHIFT;
if (old_z_sector == z_sector) {
if (old_x_sector == x_sector) {
return 0;
}
if (old_x_sector >= x_sector) {
item->rot.y = -DEG_90;
item->pos.x = (old_x_sector << WALL_SHIFT) + shift;
} else {
item->rot.y = DEG_90;
item->pos.x = (x_sector << WALL_SHIFT) - shift;
}
} else if (old_x_sector == x_sector) {
if (old_z_sector >= z_sector) {
item->rot.y = -DEG_180;
item->pos.z = (old_z_sector << WALL_SHIFT) + shift;
} else {
item->rot.y = 0;
item->pos.z = (z_sector << WALL_SHIFT) - shift;
}
}
item->floor = old.y;
item->pos.y = old.y;
if (room_num != item->room_num) {
Item_NewRoom(item_num, room_num);
}
return vault;
}
void Creature_Kill(
ITEM *const item, const int32_t kill_anim, const int32_t kill_state,
const int32_t lara_kill_state)

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

@ -4,8 +4,6 @@
#include <libtrx/game/creature.h>
int32_t Creature_Vault(
int16_t item_num, int16_t angle, int32_t vault, int32_t shift);
void Creature_Kill(
ITEM *item, int32_t kill_anim, int32_t kill_state, int32_t lara_kill_state);
void Creature_GetBaddieTarget(int16_t item_num, bool goody);