diff --git a/CMakeLists.txt b/CMakeLists.txt index 89c3e71..fe038ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,6 +297,7 @@ add_executable(my_rpg include/components/attack_component.h src/systems/combat_methods.c src/combat/attacks.c + src/sound.c src/player_utilities.c include/player_utilities.h include/systems/inventory.h @@ -324,7 +325,9 @@ add_executable(my_rpg src/npc/mage.c src/combat/boss.c src/components/combat_holder.c - src/systems/combat_utility.c src/systems/particule_methods.c) + src/systems/combat_utility.c + src/systems/particule_methods.c +) add_compile_options(-W -Wall -Wextra -Wshadow) diff --git a/Makefile b/Makefile index 459fc3d..2861ccf 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,8 @@ SRC = src/main.c \ src/components/particule_component.c \ src/systems/particule_system.c \ src/systems/combat_utility.c \ - src/systems/particule_methods.c + src/systems/particule_methods.c \ + src/sound.c OBJ = $(SRC:%.c=%.o) diff --git a/include/setup.h b/include/setup.h index 3fe696b..9c2283a 100644 --- a/include/setup.h +++ b/include/setup.h @@ -32,6 +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, float vol); bool fullscreen(gc_engine *engine, gc_entity *entity, gc_vector2 _, \ enum gc_mousekeys __); @@ -43,6 +44,10 @@ bool framerate_up(gc_engine *engine, gc_entity *entity, gc_vector2 _, \ enum gc_mousekeys __); bool framerate_down(gc_engine *engine, gc_entity *entity, gc_vector2 _, \ enum gc_mousekeys __); +bool sound_up(gc_engine *engine, gc_entity *entity, gc_vector2 _, \ +enum gc_mousekeys __); +bool sound_down(gc_engine *engine, gc_entity *entity, gc_vector2 _, \ +enum gc_mousekeys __); bool dialog_input0(gc_engine *engine, gc_entity *entity, gc_vector2 pos, \ enum gc_mousekeys key); 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 bb88cf8..873f0ce 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit bb88cf88094cb821ebded311af5b04b66cf8476c +Subproject commit 873f0cef56fb0bdea563a69db1d2667d6ea71c39 diff --git a/prefabs/options.gcprefab b/prefabs/options.gcprefab index 35e065f..cdfbfa9 100644 --- a/prefabs/options.gcprefab +++ b/prefabs/options.gcprefab @@ -11,7 +11,7 @@ - +