diff --git a/lib/gamacon b/lib/gamacon index 41d3996..e383fe3 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 41d39962d0b2eb6b605ecf9bd7623e61605e5181 +Subproject commit e383fe3fb254ad9cdf71292119cdf004b40762ba diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index 02223b9..917f432 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -57,6 +57,7 @@ + @@ -67,6 +68,7 @@ + @@ -77,6 +79,7 @@ + \ No newline at end of file diff --git a/prefabs/player.gcprefab b/prefabs/player.gcprefab index aa21e50..af52eff 100644 --- a/prefabs/player.gcprefab +++ b/prefabs/player.gcprefab @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/components/gravity_component.c b/src/components/gravity_component.c index 7e298e1..3b7aab6 100644 --- a/src/components/gravity_component.c +++ b/src/components/gravity_component.c @@ -11,7 +11,7 @@ #include "utility.h" #include -static void gravity_ctr(void *component, va_list args) +static void ctr(void *component, va_list args) { struct gravity_component *cmp = (struct gravity_component *)component; @@ -19,21 +19,22 @@ static void gravity_ctr(void *component, va_list args) cmp->max_speed = va_arg(args, int); } -static void gravity_fdctr(gc_scene *scene, void *component, node *n) +static void fdctr(gc_entity *entity, gc_scene *scene, void *component, node *n) { struct gravity_component *cmp = (struct gravity_component *)component; cmp->gravity_speed = xml_getintprop(n, "speed"); cmp->max_speed = xml_getintprop(n, "max_speed"); (void)scene; + (void)entity; } -static void gravity_dtr(void *component) +static void dtr(void *component) { (void)component; } -static char *gravity_serialize(void *component) +static char *serialize(void *component) { (void)component; return (NULL); @@ -48,10 +49,10 @@ const struct gravity_component gravity_component = { "transform_component", NULL }, - ctr: &gravity_ctr, - fdctr: &gravity_fdctr, - dtr: &gravity_dtr, - serialize: &gravity_serialize, + ctr: &ctr, + fdctr: &fdctr, + dtr: &dtr, + serialize: &serialize, destroy: &component_destroy }, gravity_speed: 10 diff --git a/src/components/jump_component.c b/src/components/jump_component.c index 635cade..0f71e58 100644 --- a/src/components/jump_component.c +++ b/src/components/jump_component.c @@ -20,7 +20,7 @@ static void ctr(void *component, va_list args) cmp->contered = false; } -static void fdctr(gc_scene *scene, void *component, node *n) +static void fdctr(gc_entity *entity, gc_scene *scene, void *component, node *n) { struct jump_action *cmp = (struct jump_action *)component; @@ -28,6 +28,7 @@ static void fdctr(gc_scene *scene, void *component, node *n) cmp->counterforce = xml_getintprop(n, "counterforce"); cmp->contered = false; (void)scene; + (void)entity; } static void dtr(void *component) diff --git a/src/components/walk_component.c b/src/components/walk_component.c index c729855..28d202e 100644 --- a/src/components/walk_component.c +++ b/src/components/walk_component.c @@ -12,7 +12,7 @@ #include "utility.h" #include -static void walk_ctr(void *component, va_list args) +static void ctr(void *component, va_list args) { struct walk_action *cmp = (struct walk_action *)component; @@ -21,7 +21,7 @@ static void walk_ctr(void *component, va_list args) cmp->decceleration = va_arg(args, int); } -static void walk_fdctr(gc_scene *scene, void *component, node *n) +static void fdctr(gc_entity *entity, gc_scene *scene, void *component, node *n) { struct walk_action *cmp = (struct walk_action *)component; @@ -29,14 +29,15 @@ static void walk_fdctr(gc_scene *scene, void *component, node *n) cmp->max_acceleration = xml_getintprop(n, "max_acceleration"); cmp->decceleration = xml_getintprop(n, "decceleration"); (void)scene; + (void)entity; } -static void walk_dtr(void *component) +static void dtr(void *component) { (void)component; } -static char *walk_serialize(void *component) +static char *serialize(void *component) { (void)component; return (NULL); @@ -52,10 +53,10 @@ const struct walk_action walk_action = { "transform_component", NULL }, - ctr: &walk_ctr, - fdctr: &walk_fdctr, - dtr: &walk_dtr, - serialize: &walk_serialize, + ctr: &ctr, + fdctr: &fdctr, + dtr: &dtr, + serialize: &serialize, destroy: &component_destroy }, acceleration: 0,