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 @@ -