diff --git a/lib/gamacon b/lib/gamacon index 20ffadd..94dbd5e 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 20ffadd22339798433c90f18d63e531b21f867fd +Subproject commit 94dbd5eb0eeec2738fdea35e56dbd05e14001d96 diff --git a/lib/quadtree b/lib/quadtree index c9f363a..b23039a 160000 --- a/lib/quadtree +++ b/lib/quadtree @@ -1 +1 @@ -Subproject commit c9f363aed97511290ea860d2aa04209a835fadad +Subproject commit b23039ac966af5e83a66e1dcecf43583493febce diff --git a/prefabs/player.gcprefab b/prefabs/player.gcprefab index f657da2..b390731 100644 --- a/prefabs/player.gcprefab +++ b/prefabs/player.gcprefab @@ -9,7 +9,7 @@ - + diff --git a/src/systems/gravity_system.c b/src/systems/gravity_system.c index 35cb558..8153175 100644 --- a/src/systems/gravity_system.c +++ b/src/systems/gravity_system.c @@ -29,8 +29,10 @@ gc_entity *entity, float dtime) else mov->acceleration.y = -grav->gravity_speed; } - if (mov->acceleration.y < 0 && col->distance_down == 0) + if (mov->acceleration.y < 0 && col->distance_down == 0) { mov->acceleration.y = 0; + mov->velocity.y = 0; + } (void)system; (void)dtime; (void)engine; diff --git a/src/systems/jump_system.c b/src/systems/jump_system.c index 2cfe383..8393659 100644 --- a/src/systems/jump_system.c +++ b/src/systems/jump_system.c @@ -25,8 +25,6 @@ gc_entity *entity, float dtime) struct movable_component *mov = GETCMP(movable_component); struct jump_action *jump = GETCMP(jump_action); - if (con->jumping) - printf("Acceleartion: %4.0f, Velocity: %4.0f Distance down: %d\n", mov->acceleration.y, mov->velocity.y, col->distance_down); if (col->distance_down == 0 && mov->acceleration.y < jump->max_acceleration) mov->acceleration.y += con->jumping * jump->acceleration; (void)system;