[Scummvm-cvs-logs] scummvm master -> 585bd7b0efc7455ed8e66e802408af8956273337

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
585bd7b0ef DREAMWEB: Untangle namespaces


Commit: 585bd7b0efc7455ed8e66e802408af8956273337
    https://github.com/scummvm/scummvm/commit/585bd7b0efc7455ed8e66e802408af8956273337
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-05T10:26:46-08:00

Commit Message:
DREAMWEB: Untangle namespaces

Changed paths:
    devtools/tasmrecover/tasm/cpp.py
    engines/dreamweb/dreamgen.h
    engines/dreamweb/structs.h
    engines/dreamweb/stubs.h
    engines/dreamweb/vgagrafx.cpp



diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index 20ccd60..df5a71d 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -612,10 +612,10 @@ namespace %s {
 		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 83bbd21..1895d6e 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 @@ public:
 	void introMonks1();
 	void resetLocation();
 	void introMonks2();
+	void advisor();
 	void additionalText();
 	void useElevator5();
 	void useElevator4();
@@ -659,7 +660,7 @@ public:
 	void lockLightOff();
 	void wearWatch();
 	void runIntroSeq();
-	void advisor();
+	void nextColon();
 	void attendant();
 	void monks2text();
 	void clearPalette();
@@ -668,7 +669,6 @@ public:
 	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 5496965..b9e3b3e 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 20e33a7..36b9ca6 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 c10fb52..440688d 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)) {