Merge branch 'master' into niels/game

1 files changed, 18 insertions, 1 deletions

diff --git a/game/menus/mainmenu/MainMenuScene.cpp b/game/menus/mainmenu/MainMenuScene.cpp
index 43418e3..fba90ac 100644
--- a/game/menus/mainmenu/MainMenuScene.cpp
+++ b/game/menus/mainmenu/MainMenuScene.cpp
@@ -1,5 +1,6 @@
 
 #include "MainMenuScene.h"
+#include "CreditsSubScene.h"
 #include "MainMenuConfig.h"
 #include "TransitionStartSubScript.h"
 
@@ -64,7 +65,7 @@ void MainMenuScene::load_scene() {
 		ButtonSubScene::Data {
 			.text = "SHOP",
 			.text_offset = {-20, 0},
-			.text_width = 115,
+			.text_width = 110,
 			.icon_offset = {60, 0},
 			.icon_type = ButtonSubScene::IconSelect::SHOP,
 			.position = pos_btn,
@@ -72,6 +73,19 @@ void MainMenuScene::load_scene() {
 		}
 	);
 
+	//Credits btn
+	pos_btn.y += MENU_BUTTON_SPACING + LARGE_OVERLAY_SIZE.y;
+	button.create(
+		*this,
+		ButtonSubScene::Data {
+			.text = "CREDITS",
+			.text_offset = {0, 0},
+			.text_width = 200,
+			.position = pos_btn,
+			.script_type = ButtonSubScene::ScriptSelect::CREDITS_SHOW,
+		}
+	);
+
 	//Start of map
 	StartSubScene start;
 	HallwaySubScene hallway;
@@ -110,6 +124,9 @@ void MainMenuScene::load_scene() {
 			.tag = MENU_INFO_TAG,
 		}
 	);
+
+	CreditsSubScene creditscene;
+	creditscene.create(*this);
 }
 
 string MainMenuScene::get_name() const { return MAINMENU_SCENE; }