Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-03 18:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify anmation switching, stop slide sounds when Lara jumps

Browse source
This commit is contained in:
Lwmte 2021-11-16 17:23:43 +03:00
parent 27b8f3486e
commit 31b49862ec
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
TR5Main/Game/Lara/lara_slide.cpp
View file

@ -38,27 +38,16 @@ void lara_slide_slope(ITEM_INFO* item, COLL_INFO* coll)
} }
else else
item->goalAnimState = LS_STOP; item->goalAnimState = LS_STOP;
StopSoundEffect(SFX_TR4_LARA_SLIPPING); StopSoundEffect(SFX_TR4_LARA_SLIPPING);
} }
} }
else else
{ {
if (item->currentAnimState == LS_SLIDE_FORWARD) if (item->currentAnimState == LS_SLIDE_FORWARD)
{ SetAnimation(item, LA_FALL_START);
item->animNumber = LA_FALL_START;
item->frameNumber = g_Level.Anims[LA_FALL_START].frameBase;
item->currentAnimState = LS_JUMP_FORWARD;
item->goalAnimState = LS_JUMP_FORWARD;
}
else else
{ SetAnimation(item, LA_FALL_BACK);
item->animNumber = LA_FALL_BACK;
item->frameNumber = g_Level.Anims[LA_FALL_BACK].frameBase;
item->currentAnimState = LS_FALL_BACK;
item->goalAnimState = LS_FALL_BACK;
}
StopSoundEffect(SFX_TR4_LARA_SLIPPING); StopSoundEffect(SFX_TR4_LARA_SLIPPING);
@ -111,7 +100,10 @@ void lara_as_slide(ITEM_INFO* item, COLL_INFO* coll)
/*collision: lara_col_slide*/ /*collision: lara_col_slide*/
Camera.targetElevation = -ANGLE(45.0f); // FIXED Camera.targetElevation = -ANGLE(45.0f); // FIXED
if ((TrInput & IN_JUMP) && !(TrInput & IN_BACK)) if ((TrInput & IN_JUMP) && !(TrInput & IN_BACK))
{
item->goalAnimState = LS_JUMP_FORWARD; item->goalAnimState = LS_JUMP_FORWARD;
StopSoundEffect(SFX_TR4_LARA_SLIPPING);
}
} }
void lara_col_slide(ITEM_INFO* item, COLL_INFO* coll) void lara_col_slide(ITEM_INFO* item, COLL_INFO* coll)
@ -129,6 +121,7 @@ void lara_as_slideback(ITEM_INFO* item, COLL_INFO* coll)
if ((TrInput & IN_JUMP) && !(TrInput & IN_FORWARD)) if ((TrInput & IN_JUMP) && !(TrInput & IN_FORWARD))
{ {
item->goalAnimState = LS_JUMP_BACK; item->goalAnimState = LS_JUMP_BACK;
StopSoundEffect(SFX_TR4_LARA_SLIPPING);
} }
} }