diff options
Diffstat (limited to 'game/mainmenu')
| -rw-r--r-- | game/mainmenu/MainMenuConfig.h | 2 | ||||
| -rw-r--r-- | game/mainmenu/MainMenuScene.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/game/mainmenu/MainMenuConfig.h b/game/mainmenu/MainMenuConfig.h index 0ce5980..3cc330c 100644 --- a/game/mainmenu/MainMenuConfig.h +++ b/game/mainmenu/MainMenuConfig.h @@ -27,7 +27,7 @@ struct MainMenuConfig { static constexpr float END = 300; static constexpr float VELOCITY_MAX = 200; static constexpr float VELOCITY_STEP = 200; - static constexpr float VELOCITY_INFO_UP = 30; + static constexpr float VELOCITY_INFO_UP = 40; //button config static constexpr crepe::vec2 LARGE_OVERLAY_SIZE = {250,100}; static constexpr crepe::vec2 SMALL_OVERLAY_SIZE_RIGHT = {150,100}; diff --git a/game/mainmenu/MainMenuScene.cpp b/game/mainmenu/MainMenuScene.cpp index c2306b1..f720ffc 100644 --- a/game/mainmenu/MainMenuScene.cpp +++ b/game/mainmenu/MainMenuScene.cpp @@ -5,6 +5,7 @@ #include "api/BehaviorScript.h" #include "api/Camera.h" #include "../background/StartSubScene.h" +#include "../background/HallwaySubScene.h" #include "MainMenuConfig.h" #include "api/GameObject.h" #include "api/Sprite.h" @@ -59,7 +60,10 @@ void MainMenuScene::load_scene(){ //Start of map StartSubScene start; - start.create(*this, MainMenuConfig::STARTMAP_OFFSET); + HallwaySubScene hallway; + float begin_x = start.create(*this, MainMenuConfig::STARTMAP_OFFSET); + begin_x = hallway.create(*this, begin_x, 1, Color::YELLOW); + //INFO menu GameObject menu_info = this->new_object("MENU_INFO_BACKGROUND",MainMenuConfig::MENU_INFO_TAG,MainMenuConfig::MENU_OFFSET); |