Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

lara/col: fix regression in Lara_Col_Walk #236

Merged
merged 1 commit into from
Sep 11, 2024
Merged

lara/col: fix regression in Lara_Col_Walk #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/game/lara/lara_col.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,12 @@ void __cdecl Lara_Col_Walk(ITEM_INFO *item, COLL_INFO *coll)

if (Lara_DeflectEdge(item, coll)) {
if (item->frame_num >= 29 && item->frame_num <= 47) {
item->anim_num = LA_WALK_STOP_RIGHT;
item->anim_num = LA_WALK_STOP_LEFT;
item->frame_num = g_Anims[item->anim_num].frame_base;
} else if (
(item->frame_num >= 22 && item->frame_num <= 28)
|| (item->frame_num >= 48 && item->frame_num <= 57)) {
item->anim_num = LA_WALK_STOP_LEFT;
item->anim_num = LA_WALK_STOP_RIGHT;
item->frame_num = g_Anims[item->anim_num].frame_base;
} else {
Lara_CollideStop(item, coll);
Expand All @@ -249,21 +249,21 @@ void __cdecl Lara_Col_Walk(ITEM_INFO *item, COLL_INFO *coll)

if (coll->side_mid.floor > STEP_L / 2) {
if (item->frame_num >= 28 && item->frame_num <= 45) {
item->anim_num = LA_WALK_DOWN_RIGHT;
item->anim_num = LA_WALK_DOWN_LEFT;
item->frame_num = g_Anims[item->anim_num].frame_base;
} else {
item->anim_num = LA_WALK_DOWN_LEFT;
item->anim_num = LA_WALK_DOWN_RIGHT;
item->frame_num = g_Anims[item->anim_num].frame_base;
}
}

if (coll->side_mid.floor >= -STEPUP_HEIGHT
&& coll->side_mid.floor < -STEP_L / 2) {
if (item->frame_num >= 27 && item->frame_num <= 44) {
item->anim_num = LA_WALK_UP_STEP_RIGHT;
item->anim_num = LA_WALK_UP_STEP_LEFT;
item->frame_num = g_Anims[item->anim_num].frame_base;
} else {
item->anim_num = LA_WALK_UP_STEP_LEFT;
item->anim_num = LA_WALK_UP_STEP_RIGHT;
item->frame_num = g_Anims[item->anim_num].frame_base;
}
}
Expand Down