From 5865d19b7adaa2a0a4492f7fa188896d7a4ec3be Mon Sep 17 00:00:00 2001
From: Anonymus Raccoon <tr.tristan-roux@outlook.fr>
Date: Sun, 3 May 2020 19:28:52 +0200
Subject: [PATCH] Adding options inside the pause menu

---
 include/setup.h                       |  2 +-
 include/systems/game_manager_system.h |  1 +
 lib/gamacon                           |  2 +-
 prefabs/pause.gcprefab                |  3 ++-
 src/main_menu.c                       | 11 ++++++++++-
 src/sound.c                           |  5 ++++-
 src/systems/game_manager_system.c     |  1 +
 7 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/include/setup.h b/include/setup.h
index 2744296..9c2283a 100644
--- a/include/setup.h
+++ b/include/setup.h
@@ -32,7 +32,7 @@ void resolution_set_txt(gc_entity *entity, gc_engine *engine, \
 enum gc_mousekeys __);
 void framerate_set_text(gc_entity *entity, gc_engine *engine, \
 enum gc_mousekeys __);
-void sound_set_text(gc_entity *entity, gc_engine *engine);
+void sound_set_text(gc_entity *entity, gc_engine *engine, float vol);
 
 bool fullscreen(gc_engine *engine, gc_entity *entity, gc_vector2 _, \
 enum gc_mousekeys __);
diff --git a/include/systems/game_manager_system.h b/include/systems/game_manager_system.h
index 7dc1eb9..1b66c72 100644
--- a/include/systems/game_manager_system.h
+++ b/include/systems/game_manager_system.h
@@ -14,6 +14,7 @@ struct game_manager_system {
 	gc_system base;
 	bool is_inventory;
 	bool has_message;
+	gc_scene *game_scene;
 };
 
 extern const struct game_manager_system game_manager_system;
diff --git a/lib/gamacon b/lib/gamacon
index 019cef8..873f0ce 160000
--- a/lib/gamacon
+++ b/lib/gamacon
@@ -1 +1 @@
-Subproject commit 019cef80f0a25fc1bf2ca1387fe77dadac296cc3
+Subproject commit 873f0cef56fb0bdea563a69db1d2667d6ea71c39
diff --git a/prefabs/pause.gcprefab b/prefabs/pause.gcprefab
index 832a889..47bdaf7 100644
--- a/prefabs/pause.gcprefab
+++ b/prefabs/pause.gcprefab
@@ -1,6 +1,7 @@
 <gc_entities>
     <panel src="panel" x="50%" y="45%" width="40%" height="69%" tag="pause" />
     <text text="Pause" x="50%" y="25%" resize="false" tag="pause"/>
-    <button text="Resume" x="50%" y="50%" click="toggle_pause" color="black" width="30%" height="20%" resize="false" tag="pause" />
+    <button text="Resume" x="50%" y="35%" click="toggle_pause" color="black" width="30%" height="20%" resize="false" tag="pause" />
+    <button text="Options" x="50%" y="50%" click="options" color="black" width="30%" height="20%" resize="false" tag="pause" />
     <button text="Quit to menu" x="50%" y="65%" click="goto_main_menu" color="black" width="30%" height="20%" resize="false" tag="pause" />
 </gc_entities>
\ No newline at end of file
diff --git a/src/main_menu.c b/src/main_menu.c
index f1852bf..8feceaa 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -5,6 +5,8 @@
 ** main_menu
 */
 
+#include <systems/combat_manager.h>
+#include <systems/game_manager_system.h>
 #include "systems/sfml_renderer_system.h"
 #include "components/dialog_holder.h"
 #include "components/dialog_holder.h"
@@ -53,6 +55,8 @@ enum gc_mousekeys __)
         my_printf("The option scene couldn't be loaded.\n");
         return (true);
     }
+    GETSYS(engine, game_manager_system)->game_scene = engine->scene;
+    engine->scene = NULL;
     engine->change_scene(engine, scene);
     entity = engine->scene->get_entity(engine->scene, 50);
     if (rend)
@@ -61,13 +65,18 @@ enum gc_mousekeys __)
     resolution_set_txt(entity, engine, 0);
     entity = engine->scene->get_entity(engine->scene, 52);
     framerate_set_text(entity, engine, 0);
+    entity = engine->scene->get_entity(engine->scene, 53);
+    sound_set_text(entity, engine, -1);
     return (true);
 }
 
 bool goto_main_menu(gc_engine *engine, gc_entity *entity, gc_vector2 _, \
 enum gc_mousekeys __)
 {
-    gc_scene *scene = scene_create(engine, "prefabs/mainmenu.gcprefab");
+    gc_scene *scene = GETSYS(engine, game_manager_system)->game_scene;
+
+    if (!scene)
+        scene = scene_create(engine, "prefabs/mainmenu.gcprefab");
     if (!scene) {
         engine->should_close = true;
         my_printf("The option scene couldn't be loaded.\n");
diff --git a/src/sound.c b/src/sound.c
index 20ae551..d600dd4 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -18,15 +18,18 @@ void sound_set_text(gc_entity *entity, gc_engine *engine, float vol)
 {
     struct sfml_renderer_system *rend = GETSYS(engine, sfml_renderer_system);
     struct renderer *renderer;
-    char volume[10];
+    static char volume[10];
 
     if (!entity)
         return;
+    if (vol == -1)
+        vol = sfListener_getGlobalVolume();
     renderer = GETCMP(entity, renderer);
     if (!rend || !renderer || renderer->type != GC_TXTREND)
         return;
     snprintf(volume, 10, "%.0f", vol);
     ((gc_text *)renderer->data)->text = volume;
+    renderer->destroy = &text_safe_destroy;
 }
 
 bool sound_down(gc_engine *engine, gc_entity *entity, gc_vector2 _, \
diff --git a/src/systems/game_manager_system.c b/src/systems/game_manager_system.c
index 0a1ba4e..b79690e 100644
--- a/src/systems/game_manager_system.c
+++ b/src/systems/game_manager_system.c
@@ -70,6 +70,7 @@ static void ctr(void *system, va_list list)
     engine->add_event_listener(engine, "combat_ended", &combat_ended);
     this->has_message = false;
     this->is_inventory = false;
+    this->game_scene = NULL;
 }
 
 static void dtr(void *system, gc_engine *engine)