From 5ed1fb5ec082ab6ee6f3ee22bd638f84fac6fcab Mon Sep 17 00:00:00 2001 From: Anonymus Raccoon Date: Mon, 6 Jan 2020 00:40:35 +0100 Subject: [PATCH] Preparing the friction that change with your platform type --- lib/gamacon | 2 +- lib/quadtree | 2 +- prefabs/player.gcprefab | 2 +- src/systems/gravity_system.c | 1 - src/systems/jump_system.c | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/gamacon b/lib/gamacon index b5b64a2..41d3996 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit b5b64a2f824351e3175f505ff640c8b60b41493c +Subproject commit 41d39962d0b2eb6b605ecf9bd7623e61605e5181 diff --git a/lib/quadtree b/lib/quadtree index a7a504f..92c9b27 160000 --- a/lib/quadtree +++ b/lib/quadtree @@ -1 +1 @@ -Subproject commit a7a504fd265048061449854a6b031c7e4a4f7f0b +Subproject commit 92c9b27f3aff4db22537ae025d784a094e938811 diff --git a/prefabs/player.gcprefab b/prefabs/player.gcprefab index 6a12a4c..aa21e50 100644 --- a/prefabs/player.gcprefab +++ b/prefabs/player.gcprefab @@ -12,7 +12,7 @@ - + diff --git a/src/systems/gravity_system.c b/src/systems/gravity_system.c index 9143dd1..bae5962 100644 --- a/src/systems/gravity_system.c +++ b/src/systems/gravity_system.c @@ -21,7 +21,6 @@ gc_entity *entity, float dtime) { struct gravity_component *grav = GETCMP(gravity_component); struct movable_component *mov = GETCMP(movable_component); - struct collision_component *col = GETCMP(collision_component); mov->acceleration.y -= grav->gravity_speed; (void)system; diff --git a/src/systems/jump_system.c b/src/systems/jump_system.c index eda4e04..50a3038 100644 --- a/src/systems/jump_system.c +++ b/src/systems/jump_system.c @@ -17,7 +17,7 @@ #include "utility.h" #include -static void update_entity(gc_engine *engine, void *system, +static void update_entity(gc_engine *engine, void *system, gc_entity *entity, float dtime) { struct collision_component *col = GETCMP(collision_component);