diff options
| author | Willem Jan Palenstijn | 2011-12-05 19:26:08 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-12-05 19:26:46 +0100 |
| commit | 585bd7b0efc7455ed8e66e802408af8956273337 (patch) | |
| tree | 2ab43cdafc72bdfc070da1b73aa52b2b573ae117 /engines | |
| parent | f28c0480e1f9633280b580d3609e2d977fba4a3b (diff) | |
| download | scummvm-rg350-585bd7b0efc7455ed8e66e802408af8956273337.tar.gz scummvm-rg350-585bd7b0efc7455ed8e66e802408af8956273337.tar.bz2 scummvm-rg350-585bd7b0efc7455ed8e66e802408af8956273337.zip | |
DREAMWEB: Untangle namespaces
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 8 | ||||
| -rw-r--r-- | engines/dreamweb/structs.h | 4 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 2 | ||||
| -rw-r--r-- | engines/dreamweb/vgagrafx.cpp | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index 83bbd21047..1895d6e814 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 5496965155..b9e3b3ed7d 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 20e33a70ff..36b9ca6fbc 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 c10fb52686..440688dce0 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)) { |