STARK: First attempt on the main menu

residualvm · May 16, 2018 · df3cd7d · df3cd7d
1 parent 9b1616e
commit df3cd7d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 1 deletion.
diff --git a/engines/stark/module.mk b/engines/stark/module.mk
@@ -87,6 +87,7 @@ MODULE_OBJS := \
 	ui/cursor.o \
 	ui/menu/diaryindex.o \
 	ui/menu/locationscreen.o \
+	ui/menu/mainmenu.o \
 	ui/window.o \
 	ui/world/actionmenu.o \
 	ui/world/button.o \

diff --git a/engines/stark/services/userinterface.cpp b/engines/stark/services/userinterface.cpp
@@ -35,6 +35,7 @@
 
 #include "engines/stark/ui/cursor.h"
 #include "engines/stark/ui/menu/diaryindex.h"
+#include "engines/stark/ui/menu/mainmenu.h"
 #include "engines/stark/ui/world/inventorywindow.h"
 #include "engines/stark/ui/world/fmvscreen.h"
 #include "engines/stark/ui/world/gamescreen.h"
@@ -46,6 +47,7 @@ UserInterface::UserInterface(Gfx::Driver *gfx) :
 		_gfx(gfx),
 		_cursor(nullptr),
 		_diaryIndexScreen(nullptr),
+		_mainMenuScreen(nullptr),
 		_exitGame(false),
 		_fmvScreen(nullptr),
 		_gameScreen(nullptr),
@@ -67,9 +69,12 @@ UserInterface::~UserInterface() {
 void UserInterface::init() {
 	_cursor = new Cursor(_gfx);
 
-	_currentScreen = _gameScreen = new GameScreen(_gfx, _cursor);
+	_mainMenuScreen = new MainMenuScreen(_gfx, _cursor);
+	_gameScreen = new GameScreen(_gfx, _cursor);
 	_diaryIndexScreen = new DiaryIndexScreen(_gfx, _cursor);
 	_fmvScreen = new FMVScreen(_gfx, _cursor);
+
+	_currentScreen = _mainMenuScreen;
 }
 
 void UserInterface::update() {

diff --git a/engines/stark/services/userinterface.h b/engines/stark/services/userinterface.h
@@ -45,6 +45,7 @@ class Driver;
 
 class DiaryIndexScreen;
 class GameScreen;
+class MainMenuScreen;
 class Cursor;
 class FMVScreen;
 
@@ -139,6 +140,7 @@ class UserInterface {
 	GameScreen *_gameScreen;
 	FMVScreen *_fmvScreen;
 	DiaryIndexScreen *_diaryIndexScreen;
+	MainMenuScreen *_mainMenuScreen;
 	Screen *_currentScreen;
 
 	Gfx::Driver *_gfx;

diff --git a/engines/stark/stark.cpp b/engines/stark/stark.cpp
@@ -146,6 +146,8 @@ Common::Error StarkEngine::run() {
 	// Initialize the UI
 	_userInterface->init();
 
+	/*
+
 	if (ConfMan.hasKey("save_slot")) {
 		// Load game from specified slot, if any
 		loadGameState(ConfMan.getInt("save_slot"));
@@ -154,6 +156,8 @@ Common::Error StarkEngine::run() {
 		setStartupLocation();
 	}
 
+	*/
+
 	// Start running
 	mainLoop();
 

diff --git a/engines/stark/ui/menu/mainmenu.cpp b/engines/stark/ui/menu/mainmenu.cpp
@@ -0,0 +1,18 @@
+#include "engines/stark/ui/menu/mainmenu.h"
+
+namespace Stark {
+
+MainMenuScreen::MainMenuScreen(Gfx::Driver *gfx, Cursor *cursor) :
+        StaticLocationScreen(gfx, cursor, "MainMenuLocation", Screen::kScreenMainMenu) {
+}
+
+MainMenuScreen::~MainMenuScreen() {
+}
+
+void MainMenuScreen::open() {
+    StaticLocationScreen::open();
+
+    //TODO: push back widgets
+}
+
+}
diff --git a/engines/stark/ui/screen.h b/engines/stark/ui/screen.h
@@ -36,6 +36,7 @@ namespace Stark {
 class Screen {
 public:
 	enum Name {
+		kScreenMainMenu,
 		kScreenGame,
 		kScreenFMV,
 		kScreenDiaryIndex