XEEN: Create a WorldOfXeen sub-namespace

7 files changed, 15 insertions, 1 deletions

diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index e5b137c394..3c619e9877 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -116,7 +116,7 @@ bool XeenMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 	case Xeen::GType_Clouds:
 	case Xeen::GType_DarkSide:
 	case Xeen::GType_WorldOfXeen:
-		*engine = new Xeen::WorldOfXeenEngine(syst, gd);
+		*engine = new Xeen::WorldOfXeen::WorldOfXeenEngine(syst, gd);
 		break;
 	default:
 		break;
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index 29442da5fa..4e50336f6e 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -25,6 +25,7 @@
 #include "xeen/sound.h"
 
 namespace Xeen {
+namespace WorldOfXeen {
 
 bool CloudsCutscenes::showCloudsTitle() {
 	EventsManager &events = *_vm->_events;
@@ -466,4 +467,5 @@ const uint CloudsCutscenes::_INTRO_FRAMES_WAIT[8][32] = {
 	}
 };
 
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.h b/engines/xeen/worldofxeen/clouds_cutscenes.h
index 25c7428686..0f413b7666 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.h
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.h
@@ -27,6 +27,7 @@
 #include "xeen/xeen.h"
 
 namespace Xeen {
+namespace WorldOfXeen {
 
 class CloudsCutscenes : public Cutscenes {
 private:
@@ -52,6 +53,8 @@ public:
 	 */
 	bool showCloudsEnding();
 };
+
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
 
 #endif /* XEEN_WORLDOFXEEN_CLOUDS_CUTSCENES_H */
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index bde5ff3826..2dc9c60e8e 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -27,6 +27,7 @@
 #include "xeen/xeen.h"
 
 namespace Xeen {
+namespace WorldOfXeen {
 
 static const int CUTSCENES_XLIST[32] = {
 	146, 145, 143, 141, 141, 141, 141, 141, 141, 141, 141, 142, 143, 144, 145, 146,
@@ -1227,4 +1228,5 @@ void DarkSideCutscenes::showPharaohEndText(const char *msg1, const char *msg2, c
 	}
 }
 
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.h b/engines/xeen/worldofxeen/darkside_cutscenes.h
index 7c6a1bfb08..30e3e8d3c9 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.h
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.h
@@ -29,6 +29,8 @@ namespace Xeen {
 
 class XeenEngine;
 
+namespace WorldOfXeen {
+
 class DarkSideCutscenes : public Cutscenes {
 protected:
 	/**
@@ -59,6 +61,7 @@ public:
 	void showDarkSideScore();
 };
 
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
 
 #endif /* XEEN_WORLDOFXEEN_DARKSIDE_CUTSCENES_H */
diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index 81922d8740..0ad76ce09b 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -26,6 +26,7 @@
 #include "xeen/sound.h"
 
 namespace Xeen {
+namespace WorldOfXeen {
 
 WorldOfXeenEngine::WorldOfXeenEngine(OSystem *syst, const XeenGameDescription *gameDesc)
 		: XeenEngine(syst, gameDesc), CloudsCutscenes(this), 
@@ -48,4 +49,5 @@ void WorldOfXeenEngine::showIntro() {
 		*/
 }
 
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
diff --git a/engines/xeen/worldofxeen/worldofxeen.h b/engines/xeen/worldofxeen/worldofxeen.h
index 68a83bb89d..3dceb891ee 100644
--- a/engines/xeen/worldofxeen/worldofxeen.h
+++ b/engines/xeen/worldofxeen/worldofxeen.h
@@ -28,6 +28,7 @@
 #include "xeen/worldofxeen/darkside_cutscenes.h"
 
 namespace Xeen {
+namespace WorldOfXeen {
 
 /**
  * Implements a descendant of the base Xeen engine to handle 
@@ -45,6 +46,7 @@ public:
 	virtual ~WorldOfXeenEngine() {}
 };
 
+} // End of namespace WorldOfXeen
 } // End of namespace Xeen
 
 #endif /* XEEN_WORLDOFXEEN_WORLDOFXEEN_H */