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

tr1/lara/state: merge empty state functions

Browse source
This commit is contained in:
Marcin Kurczewski 2025-03-14 12:05:22 +01:00
parent 81f3f46c46
commit c60a23bbe3
3 changed files with 12 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tr1/game/lara/control.c
View file

@ -30,7 +30,7 @@ static void (*m_LaraStateRoutines[])(ITEM *item, COLL_INFO *coll) = {
[LS_RUN] = Lara_State_Run,
[LS_STOP] = Lara_State_Stop,
[LS_JUMP_FORWARD] = Lara_State_ForwardJump,
[LS_POSE] = Lara_State_Pose,
[LS_POSE] = Lara_State_Empty,
[LS_FAST_BACK] = Lara_State_FastBack,
[LS_TURN_R] = Lara_State_TurnR,
[LS_TURN_L] = Lara_State_TurnL,
@ -38,9 +38,9 @@ static void (*m_LaraStateRoutines[])(ITEM *item, COLL_INFO *coll) = {
[LS_FAST_FALL] = Lara_State_FastFall,
[LS_HANG] = Lara_State_Hang,
[LS_REACH] = Lara_State_Reach,
[LS_SPLAT] = Lara_State_Splat,
[LS_SPLAT] = Lara_State_Empty,
[LS_TREAD] = Lara_State_Tread,
[LS_LAND] = Lara_State_Land,
[LS_LAND] = Lara_State_Empty,
[LS_COMPRESS] = Lara_State_Compress,
[LS_BACK] = Lara_State_Back,
[LS_SWIM] = Lara_State_Swim,
@ -49,7 +49,7 @@ static void (*m_LaraStateRoutines[])(ITEM *item, COLL_INFO *coll) = {
[LS_FAST_TURN] = Lara_State_FastTurn,
[LS_STEP_RIGHT] = Lara_State_StepRight,
[LS_STEP_LEFT] = Lara_State_StepLeft,
[LS_HIT] = Lara_State_Roll2,
[LS_HIT] = Lara_State_Empty,
[LS_SLIDE] = Lara_State_Slide,
[LS_JUMP_BACK] = Lara_State_BackJump,
[LS_JUMP_RIGHT] = Lara_State_RightJump,
@ -71,7 +71,7 @@ static void (*m_LaraStateRoutines[])(ITEM *item, COLL_INFO *coll) = {
[LS_USE_KEY] = Lara_State_UseKey,
[LS_USE_PUZZLE] = Lara_State_UsePuzzle,
[LS_UW_DEATH] = Lara_State_UWDeath,
[LS_ROLL] = Lara_State_Roll,
[LS_ROLL] = Lara_State_Empty,
[LS_SPECIAL] = Lara_State_Special,
[LS_SURF_BACK] = Lara_State_SurfBack,
[LS_SURF_LEFT] = Lara_State_SurfLeft,
@ -83,10 +83,10 @@ static void (*m_LaraStateRoutines[])(ITEM *item, COLL_INFO *coll) = {
[LS_GYMNAST] = Lara_State_Gymnast,
[LS_WATER_OUT] = Lara_State_WaterOut,
[LS_CONTROLLED] = Lara_State_Controlled,
[LS_TWIST] = Lara_State_Twist,
[LS_TWIST] = Lara_State_Empty,
[LS_UW_ROLL] = Lara_State_UWRoll,
[LS_WADE] = Lara_State_Wade,
[LS_RESPONSIVE] = Lara_State_Responsive,
[LS_RESPONSIVE] = Lara_State_Empty,
// clang-format on
};

32
src/tr1/game/lara/state.c
View file

@ -65,6 +65,10 @@ void Lara_State_Initialise(void)
m_HasResponsiveSwimming = M_HasResponsiveState(LA_SWIM_FORWARD);
}
void Lara_State_Empty(ITEM *item, COLL_INFO *coll)
{
}
void Lara_State_Walk(ITEM *item, COLL_INFO *coll)
{
if (item->hit_points <= 0) {
@ -269,10 +273,6 @@ void Lara_State_ForwardJump(ITEM *item, COLL_INFO *coll)
}
}
void Lara_State_Pose(ITEM *item, COLL_INFO *coll)
{
}
void Lara_State_FastBack(ITEM *item, COLL_INFO *coll)
{
item->goal_anim_state = LS_STOP;
@ -396,14 +396,6 @@ void Lara_State_Reach(ITEM *item, COLL_INFO *coll)
}
}
void Lara_State_Splat(ITEM *item, COLL_INFO *coll)
{
}
void Lara_State_Land(ITEM *item, COLL_INFO *coll)
{
}
void Lara_State_Compress(ITEM *item, COLL_INFO *coll)
{
if (g_Lara.water_status != LWS_WADE) {
@ -701,14 +693,6 @@ void Lara_State_UsePuzzle(ITEM *item, COLL_INFO *coll)
g_Camera.target_distance = WALL_L;
}
void Lara_State_Roll(ITEM *item, COLL_INFO *coll)
{
}
void Lara_State_Roll2(ITEM *item, COLL_INFO *coll)
{
}
void Lara_State_Special(ITEM *item, COLL_INFO *coll)
{
ITEM *const target_item = Lara_GetDeathCameraTarget();
@ -839,10 +823,6 @@ void Lara_State_FastDive(ITEM *item, COLL_INFO *coll)
item->speed = (item->speed * 95) / 100;
}
void Lara_State_Twist(ITEM *item, COLL_INFO *coll)
{
}
void Lara_State_UWRoll(ITEM *item, COLL_INFO *coll)
{
item->fall_speed = 0;
@ -1278,7 +1258,3 @@ void Lara_State_Wade(ITEM *item, COLL_INFO *coll)
item->goal_anim_state = LS_STOP;
}
}
void Lara_State_Responsive(ITEM *item, COLL_INFO *coll)
{
}

8
src/tr1/game/lara/state.h
View file

@ -6,11 +6,11 @@
void Lara_State_Initialise(void);
void Lara_State_Empty(ITEM *item, COLL_INFO *coll);
void Lara_State_Walk(ITEM *item, COLL_INFO *coll);
void Lara_State_Run(ITEM *item, COLL_INFO *coll);
void Lara_State_Stop(ITEM *item, COLL_INFO *coll);
void Lara_State_ForwardJump(ITEM *item, COLL_INFO *coll);
void Lara_State_Pose(ITEM *item, COLL_INFO *coll);
void Lara_State_FastBack(ITEM *item, COLL_INFO *coll);
void Lara_State_TurnR(ITEM *item, COLL_INFO *coll);
void Lara_State_TurnL(ITEM *item, COLL_INFO *coll);
@ -18,9 +18,7 @@ void Lara_State_Death(ITEM *item, COLL_INFO *coll);
void Lara_State_FastFall(ITEM *item, COLL_INFO *coll);
void Lara_State_Hang(ITEM *item, COLL_INFO *coll);
void Lara_State_Reach(ITEM *item, COLL_INFO *coll);
void Lara_State_Splat(ITEM *item, COLL_INFO *coll);
void Lara_State_Tread(ITEM *item, COLL_INFO *coll);
void Lara_State_Land(ITEM *item, COLL_INFO *coll);
void Lara_State_Compress(ITEM *item, COLL_INFO *coll);
void Lara_State_Back(ITEM *item, COLL_INFO *coll);
void Lara_State_Swim(ITEM *item, COLL_INFO *coll);
@ -29,7 +27,6 @@ void Lara_State_Null(ITEM *item, COLL_INFO *coll);
void Lara_State_FastTurn(ITEM *item, COLL_INFO *coll);
void Lara_State_StepRight(ITEM *item, COLL_INFO *coll);
void Lara_State_StepLeft(ITEM *item, COLL_INFO *coll);
void Lara_State_Roll2(ITEM *item, COLL_INFO *coll);
void Lara_State_Slide(ITEM *item, COLL_INFO *coll);
void Lara_State_BackJump(ITEM *item, COLL_INFO *coll);
void Lara_State_RightJump(ITEM *item, COLL_INFO *coll);
@ -52,7 +49,6 @@ void Lara_State_SwitchOff(ITEM *item, COLL_INFO *coll);
void Lara_State_UseKey(ITEM *item, COLL_INFO *coll);
void Lara_State_UsePuzzle(ITEM *item, COLL_INFO *coll);
void Lara_State_UWDeath(ITEM *item, COLL_INFO *coll);
void Lara_State_Roll(ITEM *item, COLL_INFO *coll);
void Lara_State_Special(ITEM *item, COLL_INFO *coll);
void Lara_State_SurfBack(ITEM *item, COLL_INFO *coll);
void Lara_State_SurfLeft(ITEM *item, COLL_INFO *coll);
@ -63,7 +59,5 @@ void Lara_State_SwanDive(ITEM *item, COLL_INFO *coll);
void Lara_State_FastDive(ITEM *item, COLL_INFO *coll);
void Lara_State_Gymnast(ITEM *item, COLL_INFO *coll);
void Lara_State_WaterOut(ITEM *item, COLL_INFO *coll);
void Lara_State_Twist(ITEM *item, COLL_INFO *coll);
void Lara_State_UWRoll(ITEM *item, COLL_INFO *coll);
void Lara_State_Wade(ITEM *item, COLL_INFO *coll);
void Lara_State_Responsive(ITEM *item, COLL_INFO *coll);