XEEN: Move old main menu classes into WorldOfXeen namespace

4 files changed, 22 insertions, 19 deletions

diff --git a/engines/xeen/module.mk b/engines/xeen/module.mk
index 400e273cb6..553169aef0 100644
--- a/engines/xeen/module.mk
+++ b/engines/xeen/module.mk
@@ -3,6 +3,7 @@ MODULE := engines/xeen
 MODULE_OBJS := \
 	worldofxeen/clouds_cutscenes.o \
 	worldofxeen/darkside_cutscenes.o \
+	worldofxeen/worldofxeen_menu.o \
 	worldofxeen/worldofxeen.o \
 	worldofxeen/worldofxeen_resources.o \
 	character.o \
@@ -18,7 +19,6 @@ MODULE_OBJS := \
 	dialogs_error.o \
 	dialogs_exchange.o \
 	dialogs_fight_options.o \
-	dialogs_options.o \
 	dialogs_info.o \
 	dialogs_input.o \
 	dialogs_items.o \
diff --git a/engines/xeen/dialogs_options.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index a49b6d60d5..3b8f9651b2 100644
--- a/engines/xeen/dialogs_options.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -21,13 +21,14 @@
  */
 
 #include "common/scummsys.h"
-#include "xeen/dialogs_options.h"
+#include "xeen/worldofxeen/worldofxeen_menu.h"
 #include "xeen/resources.h"
 
 namespace Xeen {
+namespace WorldOfXeen {
 
-void OptionsMenu::show(XeenEngine *vm) {
-	OptionsMenu *menu;
+void WorldOfXeenMenu::show(XeenEngine *vm) {
+	WorldOfXeenMenu *menu;
 
 	switch (vm->getGameID()) {
 	case GType_Clouds:
@@ -48,7 +49,7 @@ void OptionsMenu::show(XeenEngine *vm) {
 	delete menu;
 }
 
-void OptionsMenu::execute() {
+void WorldOfXeenMenu::execute() {
 	SpriteResource special("special.icn");
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
@@ -102,7 +103,7 @@ void OptionsMenu::execute() {
 	}
 }
 
-void OptionsMenu::showTitles1(SpriteResource &sprites) {
+void WorldOfXeenMenu::showTitles1(SpriteResource &sprites) {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 
@@ -118,7 +119,7 @@ void OptionsMenu::showTitles1(SpriteResource &sprites) {
 	}
 }
 
-void OptionsMenu::showTitles2() {
+void WorldOfXeenMenu::showTitles2() {
 	Screen &screen = *_vm->_screen;
 	EventsManager &events = *_vm->_events;
 	Sound &sound = *_vm->_sound;
@@ -153,7 +154,7 @@ void OptionsMenu::showTitles2() {
 	screen._windows[0].update();
 }
 
-void OptionsMenu::setupButtons(SpriteResource *buttons) {
+void WorldOfXeenMenu::setupButtons(SpriteResource *buttons) {
 	addButton(Common::Rect(124, 87, 124 + 53, 87 + 10), 'S');
 	addButton(Common::Rect(126, 98, 126 + 47, 98 + 10), 'L');
 	addButton(Common::Rect(91, 110, 91 + 118, 110 + 10), 'C');
@@ -228,4 +229,5 @@ void WorldOptionsMenu::showContents(SpriteResource &title1, bool waitFlag) {
 	}
 }
 
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
diff --git a/engines/xeen/dialogs_options.h b/engines/xeen/worldofxeen/worldofxeen_menu.h
index bb4aea9a36..9b507b7ed1 100644
--- a/engines/xeen/dialogs_options.h
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.h
@@ -20,19 +20,20 @@
  *
  */
 
-#ifndef XEEN_DIALOGS_OPTIONS_H
-#define XEEN_DIALOGS_OPTIONS_H
+#ifndef XEEN_WORLDOFXEEN_WORLDOFXEEN_MENU_H
+#define XEEN_WORLDOFXEEN_WORLDOFXEEN_MENU_H
 
 #include "xeen/xeen.h"
 #include "xeen/dialogs.h"
 
 namespace Xeen {
+namespace WorldOfXeen {
 
-class OptionsMenu : public SettingsBaseDialog {
+class WorldOfXeenMenu : public SettingsBaseDialog {
 private:
 	void execute();
 protected:
-	OptionsMenu(XeenEngine *vm) : SettingsBaseDialog(vm) {}
+	WorldOfXeenMenu(XeenEngine *vm) : SettingsBaseDialog(vm) {}
 protected:
 	virtual void startup(Common::String &title1, Common::String &title2) = 0;
 
@@ -46,25 +47,25 @@ protected:
 
 	virtual void openWindow() {}
 public:
-	virtual ~OptionsMenu() {}
+	virtual ~WorldOfXeenMenu() {}
 
 	static void show(XeenEngine *vm);
 };
 
-class CloudsOptionsMenu : public OptionsMenu {
+class CloudsOptionsMenu : public WorldOfXeenMenu {
 protected:
 	virtual void startup(Common::String &title1, Common::String &title2);
 public:
-	CloudsOptionsMenu(XeenEngine *vm) : OptionsMenu(vm) {}
+	CloudsOptionsMenu(XeenEngine *vm) : WorldOfXeenMenu(vm) {}
 
 	virtual ~CloudsOptionsMenu() {}
 };
 
-class DarkSideOptionsMenu : public OptionsMenu {
+class DarkSideOptionsMenu : public WorldOfXeenMenu {
 protected:
 	virtual void startup(Common::String &title1, Common::String &title2);
 public:
-	DarkSideOptionsMenu(XeenEngine *vm) : OptionsMenu(vm) {}
+	DarkSideOptionsMenu(XeenEngine *vm) : WorldOfXeenMenu(vm) {}
 
 	virtual ~DarkSideOptionsMenu() {}
 };
@@ -90,6 +91,7 @@ public:
 	virtual ~WorldOptionsMenu() {}
 };
 
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
 
-#endif /* XEEN_DIALOGS_H */
+#endif /* XEEN_WORLDOFXEEN_WORLDOFXEEN_MENU_H */
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 341af615e7..451afcc198 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -28,7 +28,6 @@
 #include "graphics/scaler.h"
 #include "graphics/thumbnail.h"
 #include "xeen/xeen.h"
-#include "xeen/dialogs_options.h"
 #include "xeen/files.h"
 #include "xeen/resources.h"