From 585bd7b0efc7455ed8e66e802408af8956273337 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Mon, 5 Dec 2011 19:26:08 +0100
Subject: [PATCH] DREAMWEB: Untangle namespaces

---
 devtools/tasmrecover/tasm/cpp.py | 4 ++--
 engines/dreamweb/dreamgen.h      | 8 ++++----
 engines/dreamweb/structs.h       | 4 ++++
 engines/dreamweb/stubs.h         | 2 +-
 engines/dreamweb/vgagrafx.cpp    | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index 20ccd608f611..df5a71d41c2c 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -612,10 +612,10 @@ def generate(self, start):
 		self.hd.write(
 """\n#include "dreamweb/runtime.h"
 
-namespace %s {
-
 #include "structs.h"
 
+namespace %s {
+
 class %sContext : public Context {
 public:
 	void __start();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 83bbd2104747..1895d6e8141c 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -27,10 +27,10 @@
 
 #include "dreamweb/runtime.h"
 
-namespace DreamGen {
-
 #include "structs.h"
 
+namespace DreamGen {
+
 class DreamGenContext : public Context {
 public:
 	void __start();
@@ -578,6 +578,7 @@ class DreamGenContext : public Context {
 	void introMonks1();
 	void resetLocation();
 	void introMonks2();
+	void advisor();
 	void additionalText();
 	void useElevator5();
 	void useElevator4();
@@ -659,7 +660,7 @@ class DreamGenContext : public Context {
 	void lockLightOff();
 	void wearWatch();
 	void runIntroSeq();
-	void advisor();
+	void nextColon();
 	void attendant();
 	void monks2text();
 	void clearPalette();
@@ -668,7 +669,6 @@ class DreamGenContext : public Context {
 	void openHotelDoor();
 	void blank();
 	void drinker();
-	void nextColon();
 	void placeFreeObject();
 	void allPalette();
 	void adjustRight();
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 549696515576..b9e3b3ed7d01 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -26,6 +26,8 @@
 #include "common/endian.h"
 #include "common/rect.h"
 
+namespace DreamGen {
+
 struct Sprite {
 	uint16 _updateCallback;
 	uint16 updateCallback() const { return READ_LE_UINT16(&_updateCallback); }
@@ -288,5 +290,7 @@ struct Atmosphere {
 	uint8 _repeat;
 };
 
+}
+
 #endif
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 20e33a70ffea..36b9ca6fbc80 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -449,7 +449,7 @@
 	void readKey();
 	void hangOne(uint16 delay);
 	void hangOne();
-	void showPCX(const ::Common::String &name);
+	void showPCX(const Common::String &name);
 	void showPCX();
 	void bibleQuote();
 	void realCredits();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index c10fb5268637..440688dce02b 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -219,7 +219,7 @@ static Common::String getFilename(Context &context) {
 	return name;
 }
 
-void DreamGenContext::showPCX(const ::Common::String &name) {
+void DreamGenContext::showPCX(const Common::String &name) {
 	Common::File pcxFile;
 
 	if (!pcxFile.open(name)) {