From cfeb0a423ab46547c7f8ab5102977a9f2d46558b Mon Sep 17 00:00:00 2001 From: KikooDX Date: Fri, 15 Jan 2021 13:10:27 +0100 Subject: [PATCH] Make gravity a player variable, and everything fall appart. --- include/player_vars.h | 1 + src/player.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/player_vars.h b/include/player_vars.h index d5b9d5e..1f8235d 100644 --- a/include/player_vars.h +++ b/include/player_vars.h @@ -5,6 +5,7 @@ typedef struct Player_vars { float friction; int acceleration; int jump_spd; + int gravity; } Player_vars; #endif /* _DEF_PLAYER_VARS */ diff --git a/src/player.c b/src/player.c index 953676d..81cd3de 100644 --- a/src/player.c +++ b/src/player.c @@ -44,6 +44,7 @@ void player_set_vars(Player *player, const Level *level) { player->vars.friction = FRICTION; player->vars.acceleration = ACCELERATION; player->vars.jump_spd = JUMP_SPD; + player->vars.gravity = GRAVITY; /* apply modifiers */ Vec pos = { player->pos.x, player->pos.y + 1 }; Tile_flags flags = player_collide_or(player, pos, level); @@ -136,9 +137,9 @@ void player_step(Player *player, Input *input, const Level *level, uint step) { if (player->spd.y < 0 && !player->jump_held) { /* The player is rising and let go the jump key, * accelerate gravity until they reach 0. */ - player->spd.y += GRAVITY * FAST_FALL_FACTOR; + player->spd.y += player->vars.gravity * FAST_FALL_FACTOR; } else { - player->spd.y += GRAVITY; + player->spd.y += player->vars.gravity; } /* Grace frames allow the player to jump a short * time after leaving a platform. */