Archive/engine-psx
0
0
Fork 0
mirror of https://github.com/luksamuk/engine-psx.git synced 2025-04-28 13:28:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Configure ledge balancing animations

Browse source
This commit is contained in:
Lucas S. Vieira 2025-01-07 11:27:45 -03:00
parent 348205b397
commit 2314fbf2f1
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/player.h
View file

@ -95,6 +95,7 @@ typedef struct {
PlayerAction action; PlayerAction action;
uint8_t col_ledge;
CollisionEvent ev_grnd1; CollisionEvent ev_grnd1;
CollisionEvent ev_grnd2; CollisionEvent ev_grnd2;
CollisionEvent ev_left; CollisionEvent ev_left;

28
src/player.c
View file

@ -104,6 +104,7 @@ load_player(Player *player,
player->ev_right = (CollisionEvent){ 0 }; player->ev_right = (CollisionEvent){ 0 };
player->ev_ceil1 = (CollisionEvent){ 0 }; player->ev_ceil1 = (CollisionEvent){ 0 };
player->ev_ceil2 = (CollisionEvent){ 0 }; player->ev_ceil2 = (CollisionEvent){ 0 };
player->col_ledge = 0;
player->action = ACTION_NONE; player->action = ACTION_NONE;
@ -453,6 +454,14 @@ _player_update_collision_tb(Player *player)
grndir, grn_mag, player->gsmode); grndir, grn_mag, player->gsmode);
} }
// Ledge sensor
if((player->vel.vz == 0) && (player->gsmode == CDIR_FLOOR)) {
CollisionEvent ev_ledge = linecast(&leveldata, &map128, &map16,
anchorx, anchory_left,
CDIR_FLOOR, grn_mag, CDIR_FLOOR);
player->col_ledge = ev_ledge.collided;
}
if(!player->grnd) { if(!player->grnd) {
// Ceiling sensors // Ceiling sensors
if(!player->ev_ceil1.collided) { if(!player->ev_ceil1.collided) {
@ -948,8 +957,18 @@ player_update(Player *player)
player->loopback_frame = 2; player->loopback_frame = 2;
} else if (!input_pressing(&player->input, PAD_LEFT) } else if (!input_pressing(&player->input, PAD_LEFT)
&& !input_pressing(&player->input, PAD_RIGHT)) { && !input_pressing(&player->input, PAD_RIGHT)) {
player_set_animation_direct(player, ANIM_STOPPED); // Balance on ledges
if(player->idle_timer > 0) player->idle_timer--; if((player->ev_grnd1.collided ^ player->ev_grnd2.collided)
&& !player->col_ledge) {
player->idle_timer = ANIM_IDLE_TIMER_MAX;
if(((player->anim_dir < 0) && player->ev_grnd1.collided)
|| ((player->anim_dir > 0) && player->ev_grnd2.collided))
player_set_animation_direct(player, ANIM_BALANCEHEAVY);
else player_set_animation_direct(player, ANIM_BALANCELIGHT);
} else {
player_set_animation_direct(player, ANIM_STOPPED);
if(player->idle_timer > 0) player->idle_timer--;
}
} }
} else { } else {
player->idle_timer = ANIM_IDLE_TIMER_MAX; player->idle_timer = ANIM_IDLE_TIMER_MAX;
@ -1020,6 +1039,11 @@ player_update(Player *player)
player_set_frame_duration(player, 3); player_set_frame_duration(player, 3);
break; break;
case ANIM_BALANCELIGHT:
case ANIM_BALANCEHEAVY:
player_set_frame_duration(player, 12);
break;
// Single-frame animations // Single-frame animations
case ANIM_STOPPED: case ANIM_STOPPED:
case ANIM_IDLE: case ANIM_IDLE: