From 9cec01cf28bf7d82ede5480d7229d4eee54c5ca3 Mon Sep 17 00:00:00 2001
From: AnonymusRaccoon <tr.tristan-roux@outlook.fr>
Date: Thu, 12 Mar 2020 21:05:46 +0100
Subject: [PATCH] Solving some warning

---
 Makefile                          | 2 +-
 include/components/game_display.h | 4 ++--
 lib/gamacon                       | 2 +-
 src/components/game_display.c     | 2 +-
 src/game_loader.c                 | 4 +++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 76da573..87541fb 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ OBJ = $(SRC:%.c=%.o)
 
 INCLUDE = -I ./include -I lib/gamacon/include -I lib/gamacon/lib/xmlparser/include
 
-CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra
+CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra -Wno-unused-parameter
 
 LDFLAGS = -L lib/gamacon -L lib/my -L lib/xmlparser -L lib/quadtree\
 -lgamacon -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-audio -lcsfml-window -lm
diff --git a/include/components/game_display.h b/include/components/game_display.h
index 8514f62..6629f85 100644
--- a/include/components/game_display.h
+++ b/include/components/game_display.h
@@ -12,12 +12,12 @@ typedef enum display_type
     HAPPINESS_DISPLAY,
     STUPIDITY_DISPLAY,
     SELECT_TILE_DISPLAY
-} display_type;
+} display_type_enum;
 
 struct game_display
 {
     gc_component base;
-    display_type type;
+    display_type_enum type;
 };
 
 const struct game_display game_display;
diff --git a/lib/gamacon b/lib/gamacon
index b85b791..d66d6e7 160000
--- a/lib/gamacon
+++ b/lib/gamacon
@@ -1 +1 @@
-Subproject commit b85b7918c320fdc0b9c3d27558e6799b8ef3df83
+Subproject commit d66d6e792409d80d51c051f7df936b4ec9bd4e54
diff --git a/src/components/game_display.c b/src/components/game_display.c
index 1dacbcc..c899abe 100644
--- a/src/components/game_display.c
+++ b/src/components/game_display.c
@@ -18,7 +18,7 @@ static void ctr(void *component, va_list args)
 {
     struct game_display *cmp = (struct game_display *)component;
 
-    cmp->type = va_arg(args, display_type);
+    cmp->type = va_arg(args, display_type_enum);
 }
 
 static void fdctr(gc_entity *entity, gc_scene *scene, void *component, node *n)
diff --git a/src/game_loader.c b/src/game_loader.c
index 34bd556..37c3233 100644
--- a/src/game_loader.c
+++ b/src/game_loader.c
@@ -17,6 +17,7 @@
 #include "components/game_manager.h"
 #include "systems/game_manager_system.h"
 #include "map_interactions.h"
+#include "my.h"
 
 const struct callback callbacks[] = {
     {"start_button", &start_button},
@@ -57,7 +58,8 @@ int register_customcmps(gc_engine *engine)
     engine->add_system(engine, &teams_system);
     engine->finish_physics(engine);
     for (int i = 0; callbacks[i].func; i++)
-        engine->add_callback(engine, callbacks[i].name, callbacks[i].func);
+        engine->add_callback(engine, my_strdup(callbacks[i].name), \
+callbacks[i].func);
     return (0);
 }