diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2025-01-08 18:40:11 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2025-01-08 18:40:11 +0100 |
| commit | ef3f5b0845ba127c0bfcda8c2fce37013fef3878 (patch) | |
| tree | e5690ff875a662ee7603844e858d82428d973a78 /game/menus | |
| parent | 424da5eb1500d90389d939cd0b3e6e75d729578d (diff) | |
| parent | 2ad15f3efab481659543a1c03cd70a36fd297538 (diff) | |
Merge branch 'master' of github.com:lonkaars/crepe into jaro/game
Diffstat (limited to 'game/menus')
| -rw-r--r-- | game/menus/MenusConfig.h | 3 | ||||
| -rw-r--r-- | game/menus/mainmenu/ITransitionScript.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/game/menus/MenusConfig.h b/game/menus/MenusConfig.h index 6ec5689..3e357a5 100644 --- a/game/menus/MenusConfig.h +++ b/game/menus/MenusConfig.h @@ -3,10 +3,9 @@ //generic menu config static constexpr int STARTING_SORTING_IN_LAYER = 7; -static constexpr const char * CAMERA_NAME = "camera"; //Scene names static constexpr const char * START_SCENE = "scene1"; -static constexpr const char * PREVIEW_SCENE = "scene1"; +static constexpr const char * PREVIEW_SCENE = "preview scene"; static constexpr const char * SHOP_SCENE = "shopmenu"; static constexpr const char * MAINMENU_SCENE = "mainmenu"; //button config diff --git a/game/menus/mainmenu/ITransitionScript.cpp b/game/menus/mainmenu/ITransitionScript.cpp index cd929a0..54b0875 100644 --- a/game/menus/mainmenu/ITransitionScript.cpp +++ b/game/menus/mainmenu/ITransitionScript.cpp @@ -1,6 +1,7 @@ #include "ITransitionScript.h" #include "MainMenuConfig.h" +#include "../../Config.h" #include "../MenusConfig.h" #include <crepe/api/Camera.h> |