XEEN: Cleanup of the game title, intro, and menu launching code

2 files changed, 15 insertions, 8 deletions

diff --git a/engines/xeen/swordsofxeen/swordsofxeen.cpp b/engines/xeen/swordsofxeen/swordsofxeen.cpp
index ebe6f74858..386136770a 100644
--- a/engines/xeen/swordsofxeen/swordsofxeen.cpp
+++ b/engines/xeen/swordsofxeen/swordsofxeen.cpp
@@ -29,10 +29,10 @@ SwordsOfXeenEngine::SwordsOfXeenEngine(OSystem *syst, const XeenGameDescription
 		: XeenEngine(syst, gameDesc) {
 }
 
-void SwordsOfXeenEngine::outerGameLoop() {
-	// TODO: Implement Swords of Xeen main menu
-
-	playGame();
+void SwordsOfXeenEngine::showMainMenu() {
+	// TODO: Implement Swords of Xeen main menu. For now, skip to playing game
+	_saves->newGame();
+	_gameMode = GMODE_PLAY_GAME;
 }
 
 void SwordsOfXeenEngine::death() {
@@ -88,7 +88,7 @@ void SwordsOfXeenEngine::dream() {
 }
 
 void SwordsOfXeenEngine::showCutscene(const Common::String &name, int status, uint score) {
-	_quitMode = QMODE_MENU;
+	_gameMode = GMODE_MENU;
 }
 
 } // End of namespace SwordsOfXeen
diff --git a/engines/xeen/swordsofxeen/swordsofxeen.h b/engines/xeen/swordsofxeen/swordsofxeen.h
index 2eda3dec29..d301423287 100644
--- a/engines/xeen/swordsofxeen/swordsofxeen.h
+++ b/engines/xeen/swordsofxeen/swordsofxeen.h
@@ -36,10 +36,17 @@ namespace SwordsOfXeen {
 class SwordsOfXeenEngine: public XeenEngine {
 protected:
 	/**
-	 * Outer gameplay loop responsible for dispatching control to game-specific
-	 * intros, main menus, or to play the actual game
+	 * Show the starting sequence/intro
 	 */
-	virtual void outerGameLoop();
+	virtual void showStartup() { 
+		// Swords of Xeen doesn't have a starting title or intro
+		_gameMode = GMODE_MENU;
+	}
+
+	/**
+	 * Show the startup menu
+	 */
+	virtual void showMainMenu();
 
 	/**
 	 * Death cutscene