STARK: Seperate Save and Load menu

engines/stark/services/userinterface.cpp

@@ -52,7 +52,8 @@ UserInterface::UserInterface(Gfx::Driver *gfx) :
 		_diaryIndexScreen(nullptr),
 		_mainMenuScreen(nullptr),
 		_settingsMenuScreen(nullptr),
-		_saveLoadMenuScreen(nullptr),
+		_saveMenuScreen(nullptr),
+		_loadMenuScreen(nullptr),
 		_exitGame(false),
 		_fmvScreen(nullptr),
 		_gameScreen(nullptr),
@@ -72,7 +73,8 @@ UserInterface::~UserInterface() {
 	delete _cursor;
 	delete _mainMenuScreen;
 	delete _settingsMenuScreen;
-	delete _saveLoadMenuScreen;
+	delete _saveMenuScreen;
+	delete _loadMenuScreen;
 }
 
 void UserInterface::init() {
@@ -82,7 +84,8 @@ void UserInterface::init() {
 	_gameScreen = new GameScreen(_gfx, _cursor);
 	_diaryIndexScreen = new DiaryIndexScreen(_gfx, _cursor);
 	_settingsMenuScreen = new SettingsMenuScreen(_gfx, _cursor);
-	_saveLoadMenuScreen = new SaveLoadMenuScreen(_gfx, _cursor);
+	_saveMenuScreen = new SaveMenuScreen(_gfx, _cursor);
+	_loadMenuScreen = new LoadMenuScreen(_gfx, _cursor);
 	_fmvScreen = new FMVScreen(_gfx, _cursor);
 
 	_prevScreenNameStack.push(Screen::kScreenMainMenu);
@@ -195,8 +198,10 @@ Screen *UserInterface::getScreenByName(Screen::Name screenName) const {
 			return _mainMenuScreen;
 		case Screen::kScreenSettingsMenu:
 			return _settingsMenuScreen;
-		case Screen::kScreenSaveLoadMenu:
-			return _saveLoadMenuScreen;
+		case Screen::kScreenSaveMenu:
+			return _saveMenuScreen;
+		case Screen::kScreenLoadMenu:
+			return _loadMenuScreen;
 		default:
 			error("Unhandled screen name '%d'", screenName);
 	}

engines/stark/services/userinterface.h

@@ -48,7 +48,8 @@ class DiaryIndexScreen;
 class GameScreen;
 class MainMenuScreen;
 class SettingsMenuScreen;
-class SaveLoadMenuScreen;
+class SaveMenuScreen;
+class LoadMenuScreen;
 class Cursor;
 class FMVScreen;
 
@@ -155,7 +156,8 @@ class UserInterface {
 	DiaryIndexScreen *_diaryIndexScreen;
 	MainMenuScreen *_mainMenuScreen;
 	SettingsMenuScreen *_settingsMenuScreen;
-	SaveLoadMenuScreen *_saveLoadMenuScreen;
+	SaveMenuScreen *_saveMenuScreen;
+	LoadMenuScreen *_loadMenuScreen;
 
 	Screen *_currentScreen;
 	Common::Stack<Screen::Name> _prevScreenNameStack;

engines/stark/ui/menu/diaryindex.cpp

@@ -123,7 +123,9 @@ void DiaryIndexScreen::quitHandler() {
 
 void DiaryIndexScreen::loadHandler() {
 	// TODO: Implement the original load screen
+	StarkUserInterface->changeScreen(Screen::kScreenLoadMenu);
 
+	/*
 	GUI::SaveLoadChooser slc(_("Load game:"), _("Load"), false);
 
 	g_engine->pauseEngine(true);
@@ -140,11 +142,14 @@ void DiaryIndexScreen::loadHandler() {
 			dialog.runModal();
 		}
 	}
+	*/
 }
 
 void DiaryIndexScreen::saveHandler() {
 	// TODO: Implement the original save screen
+	StarkUserInterface->changeScreen(Screen::kScreenSaveMenu);
 
+	/*
 	GUI::SaveLoadChooser slc(_("Save game:"), _("Save"), true);
 
 	g_engine->pauseEngine(true);
@@ -160,7 +165,7 @@ void DiaryIndexScreen::saveHandler() {
 		}
 
 		StarkUserInterface->changeScreen(Screen::kScreenGame);
-	}
+	}*/
 }
 
 } // End of namespace Stark

engines/stark/ui/menu/mainmenu.cpp

@@ -172,7 +172,7 @@ void MainMenuScreen::newGameHandler() {
 }
 
 void MainMenuScreen::loadHandler() {
-	StarkUserInterface->changeScreen(Screen::kScreenSaveLoadMenu);
+	StarkUserInterface->changeScreen(Screen::kScreenLoadMenu);
 }
 
 void MainMenuScreen::settingsHandler() {

engines/stark/ui/menu/saveloadmenu.cpp

@@ -21,11 +21,13 @@
  */
 
 #include "engines/stark/ui/menu/saveloadmenu.h"
+#include "engines/stark/services/services.h"
+#include "engines/stark/services/userinterface.h"
 
 namespace Stark {
 
-SaveLoadMenuScreen::SaveLoadMenuScreen(Gfx::Driver *gfx, Cursor *cursor) :
-		StaticLocationScreen(gfx, cursor, "LoadSaveLocation", Screen::kScreenSaveLoadMenu) {
+SaveLoadMenuScreen::SaveLoadMenuScreen(Gfx::Driver *gfx, Cursor *cursor, Screen::Name screenName) :
+		StaticLocationScreen(gfx, cursor, "LoadSaveLocation", screenName) {
 }
 
 SaveLoadMenuScreen::~SaveLoadMenuScreen() {
@@ -40,14 +42,16 @@ void SaveLoadMenuScreen::open() {
 			nullptr));
 
 	_widgets.push_back(new StaticLocationWidget(
-			"Cancel",
-			nullptr,
+			"back to index",
+			CLICK_HANDLER(SaveLoadMenuScreen, backHandler),
 			nullptr));
+	_widgets.back()->setupSounds(0, 1);
 
 	_widgets.push_back(new StaticLocationWidget(
-			"back to index",
-			nullptr,
+			"Cancel",
+			CLICK_HANDLER(SaveLoadMenuScreen, backHandler),
 			nullptr));
+	_widgets.back()->setupSounds(0, 1);
 
 	_widgets.push_back(new StaticLocationWidget(
 			"SaveText",
@@ -63,12 +67,30 @@ void SaveLoadMenuScreen::open() {
 			"Back",
 			nullptr,
 			nullptr));
+	_widgets.back()->setupSounds(0, 1);
+	_widgets.back()->setTextColor(_textColorBlack);
 
 	_widgets.push_back(new StaticLocationWidget(
 			"Next",
 			nullptr,
 			nullptr));
+	_widgets.back()->setupSounds(0, 1);
+	_widgets.back()->setTextColor(_textColorBlack);
 
 }
 
+void SaveLoadMenuScreen::backHandler() {
+	StarkUserInterface->backPrevScreen();
+}
+
+void SaveMenuScreen::open() {
+	SaveLoadMenuScreen::open();
+	_widgets[kWidgetLoadText]->setVisible(false);
+}
+
+void LoadMenuScreen::open() {
+	SaveLoadMenuScreen::open();
+	_widgets[kWidgetSaveText]->setVisible(false);
+}
+
 } // End of namespace Stark

engines/stark/ui/menu/saveloadmenu.h

@@ -32,11 +32,48 @@ namespace Stark {
  */
 class SaveLoadMenuScreen : public StaticLocationScreen {
 public:
-	SaveLoadMenuScreen(Gfx::Driver *gfx, Cursor *cursor);
+	SaveLoadMenuScreen(Gfx::Driver *gfx, Cursor *cursor, Screen::Name screenName);
 	virtual ~SaveLoadMenuScreen();
 
 	// StaticLocationScreen API
 	void open() override;
+
+protected:
+	enum WidgetIndex {
+		kWidgetSaveText = 3,
+		kWidgetLoadText = 4,
+	};
+
+private:
+	static const uint32 _textColorBlack = 0xFF000000;
+
+	void backHandler();
+};
+
+/**
+ * The save menu of the game
+ */
+class SaveMenuScreen : public SaveLoadMenuScreen {
+public:
+	SaveMenuScreen(Gfx::Driver *gfx, Cursor *cursor) : 
+			SaveLoadMenuScreen(gfx, cursor, Screen::kScreenSaveMenu) {}
+	virtual ~SaveMenuScreen() {}
+
+	// SaveLoadMenuScreen API
+	void open() override;
+};
+
+/**
+ * The load menu of the game
+ */
+class LoadMenuScreen : public SaveLoadMenuScreen {
+public:
+	LoadMenuScreen(Gfx::Driver *gfx, Cursor *cursor) : 
+			SaveLoadMenuScreen(gfx, cursor, Screen::kScreenLoadMenu) {}
+	virtual ~LoadMenuScreen() {}
+
+	// SaveLoadMenuScreen API
+	void open() override;
 };
 
 } // End of namespace Stark

engines/stark/ui/screen.h

@@ -41,7 +41,8 @@ class Screen {
 		kScreenFMV,
 		kScreenDiaryIndex,
 		kScreenSettingsMenu,
-		kScreenSaveLoadMenu
+		kScreenSaveMenu,
+		kScreenLoadMenu
 	};
 
 	explicit Screen(Name name) : _name(name) {};