diff --git a/Makefile b/Makefile index 2381f2a..f3ff4ac 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ TESTS = tests/deserializations.c \ INCLUDE = -I ./include -CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra +CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra -Wno-unused-parameter LDFLAGS = -L ../my -L ../xmlparser -L ../quadtree\ -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-window -lm diff --git a/include/list.h b/include/list.h index e2d0bae..4b5b00c 100644 --- a/include/list.h +++ b/include/list.h @@ -17,7 +17,7 @@ struct gc_list }; gc_list *list_add(gc_list *list, void *obj); -gc_list *list_remove(gc_list *list, void *obj); +gc_list *list_remove(gc_list *list, const void *obj); #define LISTADD(list, obj) (list = list_add(list, obj)) #define LISTREM(list, obj) (list = list_remove(list, obj)) \ No newline at end of file diff --git a/include/prefab.h b/include/prefab.h index 3c4075b..6203c7a 100644 --- a/include/prefab.h +++ b/include/prefab.h @@ -13,4 +13,4 @@ int prefab_load(gc_engine *engine, const char *path); int prefab_loadentities(node *n, gc_engine *engine, gc_scene *scene); gc_entity *deserialize_entity(gc_engine *engine, gc_scene *scene, node *n); gc_component *deserialize_component(gc_engine *engine, gc_entity *entity, \ -gc_scene *scene, node *n); \ No newline at end of file +gc_scene *scene, node *n); diff --git a/src/components/fixed_to_cam.c b/src/components/fixed_to_cam.c index cb176aa..cecbd71 100644 --- a/src/components/fixed_to_cam.c +++ b/src/components/fixed_to_cam.c @@ -62,5 +62,11 @@ const struct fixed_to_cam fixed_to_cam = { serialize: &serialize, destroy: &component_destroy }, - pos: (gc_vector2){0, 0} + pos: (gc_vector2){0, 0}, + per_x: false, + per_y: false, + per_w: false, + size_x: 0, + size_y: 0, + per_h: false }; \ No newline at end of file diff --git a/src/engine/event_manager.c b/src/engine/event_manager.c index 7effde4..d1e40ff 100644 --- a/src/engine/event_manager.c +++ b/src/engine/event_manager.c @@ -15,14 +15,14 @@ bool engine_add_event_listener(gc_engine *engine, const char *name, \ void (*func)(gc_engine *, va_list)) { - struct gc_event_listener *node = malloc(sizeof(struct gc_event_listener)); + struct gc_event_listener *n = malloc(sizeof(struct gc_event_listener)); char *n_name = my_strdup(name); - if (!name || !node || !n_name) + if (!name || !n || !n_name) return (false); - node->name = n_name; - node->func = func; - LISTADD(engine->event_listeners, node); + n->name = n_name; + n->func = func; + LISTADD(engine->event_listeners, n); return (true); } diff --git a/src/sfml_renderer/sfml_drawer.c b/src/sfml_renderer/sfml_drawer.c index e8f5e0e..86fbc3f 100644 --- a/src/sfml_renderer/sfml_drawer.c +++ b/src/sfml_renderer/sfml_drawer.c @@ -60,7 +60,6 @@ gc_sprite *sprite, float dt) void sfmlrenderer_draw_anim(gc_engine *engine, gc_entity *entity, \ gc_animholder *holder, float dtime) { - struct transform_component *tra = GETCMP(entity, transform_component); gc_int_rect *rec = &holder->sprite->rect; gc_anim *curr = holder->current; diff --git a/src/sfml_renderer/sfml_events.c b/src/sfml_renderer/sfml_events.c index 1dd27af..67a5749 100644 --- a/src/sfml_renderer/sfml_events.c +++ b/src/sfml_renderer/sfml_events.c @@ -22,7 +22,7 @@ void sfml_handle_events(gc_engine *engine) sfRenderWindow_close(rend->window); break; case sfEvtResized: - engine->on_resize(engine, (gc_vector2){event.size.width, \ + engine->on_resize(engine, (gc_vector2){event.size.width, \ event.size.height}); break; case sfEvtMouseButtonReleased: diff --git a/src/systems/camera_follow_system.c b/src/systems/camera_follow_system.c index 70a1f7e..0eba766 100644 --- a/src/systems/camera_follow_system.c +++ b/src/systems/camera_follow_system.c @@ -48,5 +48,6 @@ const struct camerafollow_system camerafollow_system = { update_entity: &update_entity, destroy: &system_destroy }, - cam_pos: (gc_vector2){0, 0} + cam_pos: (gc_vector2){0, 0}, + enabled: false }; \ No newline at end of file diff --git a/src/systems/sfml_renderer_system.c b/src/systems/sfml_renderer_system.c index 6c9a4eb..2ef9e8b 100644 --- a/src/systems/sfml_renderer_system.c +++ b/src/systems/sfml_renderer_system.c @@ -27,7 +27,7 @@ gc_vector2 sfml_get_text_size(sf_renderer *this, gc_text *text) return (gc_vector2) {bounds.width * 1.3, bounds.height * 2.5}; } -static const void (*drawers[])(gc_engine *, gc_entity *, void *, float) = { +static void (* const drawers[])(gc_engine *, gc_entity *, void *, float) = { &sfmlrenderer_draw_texture, &sfmlrenderer_draw_anim, &sfmlrenderer_draw_txt, diff --git a/src/ui/button.c b/src/ui/button.c index eb76a5f..73f56db 100644 --- a/src/ui/button.c +++ b/src/ui/button.c @@ -51,7 +51,7 @@ gc_list *new_button(gc_engine *engine, gc_scene *scene, node *n) { gc_list *entities = NULL; gc_text text = (gc_text){xml_gettempprop(n, "text"), - scene->get_data(scene, "font", NULL)}; + scene->get_data(scene, "font", NULL), 30, 0x000, false}; gc_entity *background = background_from_text(engine, scene, n, &text); if (!background) diff --git a/src/utility/list.c b/src/utility/list.c index b6d3354..784545a 100644 --- a/src/utility/list.c +++ b/src/utility/list.c @@ -32,7 +32,7 @@ gc_list *list_add(gc_list *list, void *obj) return (listconst); } -gc_list *list_remove(gc_list *list, void *obj) +gc_list *list_remove(gc_list *list, const void *obj) { gc_list *listconst = list; diff --git a/src/utility/vector2.c b/src/utility/vector2.c index 1006591..e37d108 100644 --- a/src/utility/vector2.c +++ b/src/utility/vector2.c @@ -31,5 +31,5 @@ gc_vector2 gc_vector2_add(gc_vector2 first, gc_vector2 second) gc_vector2 gc_vector2_from_sf(sfVector2f sf_vector) { - return (gc_vector2){sf_vector.x, sf_vector.y}; + return (gc_vector2){sf_vector.x, sf_vector.y}; } \ No newline at end of file