diff options
| author | Einar Johan Trøan Sømåen | 2012-08-13 03:42:30 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-13 03:42:30 +0200 |
| commit | fed19cb66ae5b56dd7dc81b90edd5a0d15986678 (patch) | |
| tree | d1c3a237aa6b421aedea2cb3bab88b8689dea4a1 /engines/wintermute/base | |
| parent | ddfa227b939d922f738f932997b70110453068cf (diff) | |
| download | scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.gz scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.bz2 scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.zip | |
WINTERMUTE: WinterMute -> Wintermute
Diffstat (limited to 'engines/wintermute/base')
118 files changed, 270 insertions, 270 deletions
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp index 8fa26f04a6..11f308a522 100644 --- a/engines/wintermute/base/base.cpp +++ b/engines/wintermute/base/base.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base_parser.h"
#include "engines/wintermute/base/base_dynamic_buffer.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseClass::BaseClass(BaseGame *gameOwner) {
@@ -182,4 +182,4 @@ bool BaseClass::saveAsText(BaseDynamicBuffer *buffer, int indent) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h index dcd186be42..b1b184b2f4 100644 --- a/engines/wintermute/base/base.h +++ b/engines/wintermute/base/base.h @@ -35,7 +35,7 @@ #include "common/hashmap.h"
#include "common/hash-str.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseGame;
class BaseDynamicBuffer;
@@ -59,6 +59,6 @@ protected: std::map<std::string, std::string>::iterator _editorPropsIter;*/
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp index a895735725..46870a0d29 100644 --- a/engines/wintermute/base/base_active_rect.cpp +++ b/engines/wintermute/base/base_active_rect.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseActiveRect::BaseActiveRect(BaseGame *inGame) : BaseClass(inGame) {
@@ -107,4 +107,4 @@ void BaseActiveRect::clipRect() { BasePlatform::intersectRect(&_rect, &_rect, &rc);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h index 0885b0e13e..b446dadcce 100644 --- a/engines/wintermute/base/base_active_rect.h +++ b/engines/wintermute/base/base_active_rect.h @@ -32,7 +32,7 @@ #include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseRegion;
class BaseSubFrame;
class BaseObject;
@@ -55,6 +55,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_dynamic_buffer.cpp b/engines/wintermute/base/base_dynamic_buffer.cpp index d953483be8..0a7a214ba4 100644 --- a/engines/wintermute/base/base_dynamic_buffer.cpp +++ b/engines/wintermute/base/base_dynamic_buffer.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_engine.h"
#include "engines/wintermute/base/base_dynamic_buffer.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseDynamicBuffer::BaseDynamicBuffer(BaseGame *inGame, uint32 initSize, uint32 growBy) {
@@ -201,4 +201,4 @@ void BaseDynamicBuffer::putTextForm(const char *format, va_list argptr) { putBytes((byte *)buff, strlen(buff));
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_dynamic_buffer.h b/engines/wintermute/base/base_dynamic_buffer.h index ff3897e71b..8285b472b2 100644 --- a/engines/wintermute/base/base_dynamic_buffer.h +++ b/engines/wintermute/base/base_dynamic_buffer.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseDynamicBuffer {
public:
@@ -61,6 +61,6 @@ private: void putTextForm(const char *format, va_list argptr);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_engine.cpp b/engines/wintermute/base/base_engine.cpp index c31777c866..3447407866 100644 --- a/engines/wintermute/base/base_engine.cpp +++ b/engines/wintermute/base/base_engine.cpp @@ -33,10 +33,10 @@ #include "engines/wintermute/system/sys_class_registry.h" #include "common/system.h" namespace Common { -DECLARE_SINGLETON(WinterMute::BaseEngine); +DECLARE_SINGLETON(Wintermute::BaseEngine); } -namespace WinterMute { +namespace Wintermute { BaseEngine::BaseEngine() { _fileManager = NULL; @@ -49,7 +49,7 @@ BaseEngine::BaseEngine() { void BaseEngine::init() { _fileManager = new BaseFileManager(); // Don't forget to register your random source - _rnd = new Common::RandomSource("WinterMute"); + _rnd = new Common::RandomSource("Wintermute"); _classReg = new SystemClassRegistry(); _classReg->registerClasses(); } @@ -82,7 +82,7 @@ void BaseEngine::LOG(bool res, const char *fmt, ...) { if (instance()._gameRef) { instance()._gameRef->LOG("%s", buff); } else { - debugCN(kWinterMuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff); + debugCN(kWintermuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff); } } @@ -90,4 +90,4 @@ uint32 BaseEngine::randInt(int from, int to) { return _rnd->getRandomNumberRng(from, to); } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h index 04199715af..32007ef571 100644 --- a/engines/wintermute/base/base_engine.h +++ b/engines/wintermute/base/base_engine.h @@ -33,13 +33,13 @@ #include "common/singleton.h" #include "common/random.h" -namespace WinterMute { +namespace Wintermute { class BaseFileManager; class BaseRegistry; class BaseGame; class SystemClassRegistry; -class BaseEngine : public Common::Singleton<WinterMute::BaseEngine> { +class BaseEngine : public Common::Singleton<Wintermute::BaseEngine> { void init(); BaseFileManager *_fileManager; Common::String _gameId; @@ -63,6 +63,6 @@ public: const char *getGameId() { return _gameId.c_str(); } }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp index 4bc166f841..580a7afeb4 100644 --- a/engines/wintermute/base/base_fader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/base_game.h"
#include "common/util.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -191,4 +191,4 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_fader.h b/engines/wintermute/base/base_fader.h index 4401bd0ebd..34d0e7d3da 100644 --- a/engines/wintermute/base/base_fader.h +++ b/engines/wintermute/base/base_fader.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_object.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFader : public BaseObject {
public:
@@ -58,6 +58,6 @@ private: uint32 _startTime;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index c17a456f11..f7a3b6a3fb 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -46,7 +46,7 @@ #include "common/savefile.h"
#include "common/fs.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -88,20 +88,20 @@ byte *BaseFileManager::readWholeFile(const Common::String &filename, uint32 *siz Common::SeekableReadStream *file = openFile(filename);
if (!file) {
if (mustExist) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Error opening file '%s'", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error opening file '%s'", filename.c_str());
}
return NULL;
}
buffer = new byte[file->size() + 1];
if (buffer == NULL) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Error allocating buffer for file '%s' (%d bytes)", filename.c_str(), file->size() + 1);
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error allocating buffer for file '%s' (%d bytes)", filename.c_str(), file->size() + 1);
closeFile(file);
return NULL;
}
if (file->read(buffer, (uint32)file->size()) != (uint32)file->size()) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Error reading file '%s'", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error reading file '%s'", filename.c_str());
closeFile(file);
delete[] buffer;
return NULL;
@@ -165,7 +165,7 @@ bool BaseFileManager::initPaths() { bool BaseFileManager::registerPackages(const Common::FSList &fslist) {
for (Common::FSList::const_iterator it = fslist.begin(); it != fslist.end(); it++) {
- debugC(kWinterMuteDebugFileAccess, "Adding %s", (*it).getName().c_str());
+ debugC(kWintermuteDebugFileAccess, "Adding %s", (*it).getName().c_str());
if ((*it).getName().contains(".dcp")) {
if (registerPackage((*it))) {
addPath(PATH_PACKAGE, (*it));
@@ -177,13 +177,13 @@ bool BaseFileManager::registerPackages(const Common::FSList &fslist) { //////////////////////////////////////////////////////////////////////////
bool BaseFileManager::registerPackages() {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Scanning packages");
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Scanning packages");
// Register without using SearchMan, as otherwise the FSNode-based lookup in openPackage will fail
// and that has to be like that to support the detection-scheme.
Common::FSList files;
for (Common::FSList::iterator it = _packagePaths.begin(); it != _packagePaths.end(); it++) {
- debugC(kWinterMuteDebugFileAccess, "Should register folder: %s %s", (*it).getPath().c_str(), (*it).getName().c_str());
+ debugC(kWintermuteDebugFileAccess, "Should register folder: %s %s", (*it).getPath().c_str(), (*it).getName().c_str());
(*it).getChildren(files, Common::FSNode::kListFilesOnly);
for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); fileIt++) {
if (!fileIt->getName().hasSuffix(".dcp")) {
@@ -198,12 +198,12 @@ bool BaseFileManager::registerPackages() { continue;
}
}
- debugC(kWinterMuteDebugFileAccess, "Registering %s %s", (*fileIt).getPath().c_str(), (*fileIt).getName().c_str());
+ debugC(kWintermuteDebugFileAccess, "Registering %s %s", (*fileIt).getPath().c_str(), (*fileIt).getName().c_str());
registerPackage((*fileIt));
}
}
-// debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, " Registered %d files in %d package(s)", _files.size(), _packages.size());
+// debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, " Registered %d files in %d package(s)", _files.size(), _packages.size());
return STATUS_OK;
}
@@ -263,7 +263,7 @@ Common::SeekableReadStream *BaseFileManager::openFile(const Common::String &file if (strcmp(filename.c_str(), "") == 0) {
return NULL;
}
- debugC(kWinterMuteDebugFileAccess, "Open file %s", filename.c_str());
+ debugC(kWintermuteDebugFileAccess, "Open file %s", filename.c_str());
Common::SeekableReadStream *file = openFileRaw(filename);
if (file && keepTrackOf) {
@@ -317,7 +317,7 @@ Common::SeekableReadStream *BaseFileManager::openFileRaw(const Common::String &f return ret;
}
- debugC(kWinterMuteDebugFileAccess ,"BFileManager::OpenFileRaw - Failed to open %s", filename.c_str());
+ debugC(kWintermuteDebugFileAccess ,"BFileManager::OpenFileRaw - Failed to open %s", filename.c_str());
return NULL;
}
@@ -328,4 +328,4 @@ BaseFileManager *BaseFileManager::getEngineInstance() { return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h index 23032ca65a..91b1add1c8 100644 --- a/engines/wintermute/base/base_file_manager.h +++ b/engines/wintermute/base/base_file_manager.h @@ -34,7 +34,7 @@ #include "common/fs.h"
#include "common/file.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFileManager {
public:
bool cleanup();
@@ -69,6 +69,6 @@ private: // the detector too, without launching the entire engine:
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp index 5473419f22..1462f1430d 100644 --- a/engines/wintermute/base/base_frame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -39,7 +39,7 @@ #include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseFrame, false)
@@ -757,4 +757,4 @@ const char *BaseFrame::scToString() { return "[frame]";
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h index b019ebf7b6..b1eae6b659 100644 --- a/engines/wintermute/base/base_frame.h +++ b/engines/wintermute/base/base_frame.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
#include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSound;
class BaseSubFrame;
class BaseObject;
@@ -68,6 +68,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index b92da4c11b..568e6dc6fd 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -72,7 +72,7 @@ #include "common/system.h"
#include "common/file.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -307,7 +307,7 @@ BaseGame::~BaseGame() { _stringTable = NULL;
DEBUG_DebugDisable();
- debugC(kWinterMuteDebugLog, "--- shutting down normally ---\n");
+ debugC(kWintermuteDebugLog, "--- shutting down normally ---\n");
}
@@ -538,7 +538,7 @@ void BaseGame::LOG(bool res, const char *fmt, ...) { _engineLogCallback(buff, res, _engineLogCallbackData);
}
- debugCN(kWinterMuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
+ debugCN(kWintermuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
//fprintf((FILE *)_debugLogFile, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
//fflush((FILE *)_debugLogFile);
@@ -4490,4 +4490,4 @@ AnsiString BaseGame::getDeviceType() const { return "computer";
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index 8a587da3e3..43efad1482 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -36,7 +36,7 @@ #include "engines/wintermute/math/rect32.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
typedef void (*ENGINE_LOG_CALLBACK)(char *text, bool result, void *data);
@@ -357,6 +357,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp index 01b5cea36d..70d92784a5 100644 --- a/engines/wintermute/base/base_keyboard_state.cpp +++ b/engines/wintermute/base/base_keyboard_state.cpp @@ -32,7 +32,7 @@ #include "common/system.h"
#include "common/keyboard.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseKeyboardState, false)
@@ -309,4 +309,4 @@ Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) { }
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_keyboard_state.h b/engines/wintermute/base/base_keyboard_state.h index 8c4b1afb59..382dd9fbce 100644 --- a/engines/wintermute/base/base_keyboard_state.h +++ b/engines/wintermute/base/base_keyboard_state.h @@ -35,7 +35,7 @@ #include "common/keyboard.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseKeyboardState : public BaseScriptable {
public:
@@ -70,6 +70,6 @@ private: Common::KeyCode vKeyToKeyCode(uint32 vkey); //TODO, reimplement using ScummVM-backend
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_named_object.cpp b/engines/wintermute/base/base_named_object.cpp index 0873f090d0..d95dd3e25b 100644 --- a/engines/wintermute/base/base_named_object.cpp +++ b/engines/wintermute/base/base_named_object.cpp @@ -28,7 +28,7 @@ #include "engines/wintermute/base/base_named_object.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseNamedObject::BaseNamedObject(BaseGame *inGame) : BaseClass(inGame) {
@@ -68,4 +68,4 @@ void BaseNamedObject::setName(const char *name) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_named_object.h b/engines/wintermute/base/base_named_object.h index 32e4d561d7..cd856bb008 100644 --- a/engines/wintermute/base/base_named_object.h +++ b/engines/wintermute/base/base_named_object.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseNamedObject : public BaseClass {
char *_name;
@@ -46,6 +46,6 @@ public: void setName(const char *name);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp index 7d186c7f0a..ff8fcd0bf2 100644 --- a/engines/wintermute/base/base_object.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseObject, false)
@@ -1243,4 +1243,4 @@ bool BaseObject::afterMove() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h index c1e3172a77..34d9ca89ca 100644 --- a/engines/wintermute/base/base_object.h +++ b/engines/wintermute/base/base_object.h @@ -34,7 +34,7 @@ #include "engines/wintermute/persistent.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSprite;
class BaseSound;
@@ -142,6 +142,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp index 75268f6483..bbbb5d69ba 100644 --- a/engines/wintermute/base/base_parser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -35,7 +35,7 @@ #define WHITESPACE " \t\n\r"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -464,4 +464,4 @@ int BaseParser::scanStr(const char *in, const char *format, ...) { return num;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_parser.h b/engines/wintermute/base/base_parser.h index 34266bd5bd..3d63668059 100644 --- a/engines/wintermute/base/base_parser.h +++ b/engines/wintermute/base/base_parser.h @@ -54,7 +54,7 @@ #include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseParser {
public:
@@ -83,6 +83,6 @@ private: char *_whiteSpace;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index e6ed5cb7e0..1beaeecdd7 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -43,7 +43,7 @@ #include "common/system.h"
#include "common/savefile.h"
-namespace WinterMute {
+namespace Wintermute {
#define SAVE_BUFFER_INIT_SIZE 100000
#define SAVE_BUFFER_GROW_BY 50000
@@ -134,7 +134,7 @@ Common::String BasePersistenceManager::getFilenameForSlot(int slot) const { void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &desc) {
Common::String filename = getFilenameForSlot(slot);
- debugC(kWinterMuteDebugSaveGame, "Trying to list savegame %s in slot %d", filename.c_str(), slot);
+ debugC(kWintermuteDebugSaveGame, "Trying to list savegame %s in slot %d", filename.c_str(), slot);
if (DID_FAIL(readHeader(filename))) {
warning("getSavedDesc(%d) - Failed for %s", slot, filename.c_str());
return;
@@ -331,7 +331,7 @@ bool BasePersistenceManager::initLoad(const Common::String &filename) { _saving = false;
if (_savedName == "" || scumm_stricmp(_savedName.c_str(), _gameRef->getName()) != 0) {
- debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game name doesn't match current game");
+ debugC(kWintermuteDebugSaveGame, "ERROR: Saved game name doesn't match current game");
cleanup();
return STATUS_FAILED;
}
@@ -342,8 +342,8 @@ bool BasePersistenceManager::initLoad(const Common::String &filename) { (_savedVerMajor == DCGF_VER_MAJOR && _savedVerMinor == DCGF_VER_MINOR && _savedVerBuild > DCGF_VER_BUILD)
) {
- debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game version is newer than current game");
- debugC(kWinterMuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
+ debugC(kWintermuteDebugSaveGame, "ERROR: Saved game version is newer than current game");
+ debugC(kWintermuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
cleanup();
return STATUS_FAILED;
}
@@ -353,8 +353,8 @@ bool BasePersistenceManager::initLoad(const Common::String &filename) { (_savedVerMajor == SAVEGAME_VER_MAJOR && _savedVerMinor < SAVEGAME_VER_MINOR) ||
(_savedVerMajor == SAVEGAME_VER_MAJOR && _savedVerMinor == SAVEGAME_VER_MINOR && _savedVerBuild < SAVEGAME_VER_BUILD)
) {
- debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game is too old and cannot be used by this version of game engine");
- debugC(kWinterMuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
+ debugC(kWintermuteDebugSaveGame, "ERROR: Saved game is too old and cannot be used by this version of game engine");
+ debugC(kWintermuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
cleanup();
return STATUS_FAILED;
@@ -371,7 +371,7 @@ bool BasePersistenceManager::saveFile(const Common::String &filename) { byte *buffer = ((Common::MemoryWriteStreamDynamic *)_saveStream)->getData();
uint32 bufferSize = ((Common::MemoryWriteStreamDynamic *)_saveStream)->size();
- Common::SaveFileManager *saveMan = ((WinterMuteEngine *)g_engine)->getSaveFileMan();
+ Common::SaveFileManager *saveMan = ((WintermuteEngine *)g_engine)->getSaveFileMan();
Common::OutSaveFile *file = saveMan->openForSaving(filename);
file->write(prefixBuffer, prefixSize);
file->write(buffer, bufferSize);
@@ -792,7 +792,7 @@ bool BasePersistenceManager::transfer(const char *name, void *val) { if (_saving) {
SystemClassRegistry::getInstance()->getPointerID(*(void **)val, &classID, &instanceID);
if (*(void **)val != NULL && (classID == -1 || instanceID == -1)) {
- debugC(kWinterMuteDebugSaveGame, "Warning: invalid instance '%s'", name);
+ debugC(kWintermuteDebugSaveGame, "Warning: invalid instance '%s'", name);
}
_saveStream->writeUint32LE(classID);
@@ -825,4 +825,4 @@ bool BasePersistenceManager::checkVersion(byte verMajor, byte verMinor, byte ver return true;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 87892b42f3..fea8f231d1 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -38,7 +38,7 @@ #include "common/system.h"
#include "common/rect.h"
-namespace WinterMute {
+namespace Wintermute {
class Vector2;
class BaseGame;
@@ -113,6 +113,6 @@ private: BaseGame *_gameRef;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_point.cpp b/engines/wintermute/base/base_point.cpp index 99e8c609df..73e7e4690a 100644 --- a/engines/wintermute/base/base_point.cpp +++ b/engines/wintermute/base/base_point.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_point.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BasePoint, false)
@@ -60,4 +60,4 @@ bool BasePoint::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_point.h b/engines/wintermute/base/base_point.h index 35d310b8d9..68a37c0110 100644 --- a/engines/wintermute/base/base_point.h +++ b/engines/wintermute/base/base_point.h @@ -32,7 +32,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BasePoint: public BaseClass {
public:
@@ -45,6 +45,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_quick_msg.cpp b/engines/wintermute/base/base_quick_msg.cpp index e9f3e430af..dfe25b474b 100644 --- a/engines/wintermute/base/base_quick_msg.cpp +++ b/engines/wintermute/base/base_quick_msg.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_quick_msg.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseQuickMsg::BaseQuickMsg(BaseGame *inGame, const char *text) : BaseClass(inGame) {
@@ -54,4 +54,4 @@ char *BaseQuickMsg::getText() { return _text;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_quick_msg.h b/engines/wintermute/base/base_quick_msg.h index f2f9144bc0..bef81827b0 100644 --- a/engines/wintermute/base/base_quick_msg.h +++ b/engines/wintermute/base/base_quick_msg.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseQuickMsg : public BaseClass {
public:
@@ -43,6 +43,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp index 82dc359eb0..a781c7eeb7 100644 --- a/engines/wintermute/base/base_region.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/platform_osystem.h"
#include <limits.h>
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseRegion, false)
@@ -536,4 +536,4 @@ bool BaseRegion::mimic(BaseRegion *region, float scale, int x, int y) { return createRegion() ? STATUS_OK : STATUS_FAILED;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h index 7770d345f7..f456eb07fc 100644 --- a/engines/wintermute/base/base_region.h +++ b/engines/wintermute/base/base_region.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_point.h"
#include "engines/wintermute/base/base_object.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseRegion : public BaseObject {
public:
@@ -64,6 +64,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_save_thumb_helper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp index 0d580e8db3..8cd15ccf1d 100644 --- a/engines/wintermute/base/base_save_thumb_helper.cpp +++ b/engines/wintermute/base/base_save_thumb_helper.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/gfx/base_image.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseSaveThumbHelper::BaseSaveThumbHelper(BaseGame *inGame) : BaseClass(inGame) {
@@ -77,4 +77,4 @@ bool BaseSaveThumbHelper::storeThumbnail(bool doFlip) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_save_thumb_helper.h b/engines/wintermute/base/base_save_thumb_helper.h index d0d0757fbf..4131cf89d4 100644 --- a/engines/wintermute/base/base_save_thumb_helper.h +++ b/engines/wintermute/base/base_save_thumb_helper.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseImage;
@@ -46,6 +46,6 @@ private: BaseImage *_richThumbnail;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp index b40647dc7b..d57638a4a8 100644 --- a/engines/wintermute/base/base_script_holder.cpp +++ b/engines/wintermute/base/base_script_holder.cpp @@ -34,7 +34,7 @@ #include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseScriptHolder, false)
@@ -501,4 +501,4 @@ bool BaseScriptHolder::sendEvent(const char *eventName) { return DID_SUCCEED(applyEvent(eventName));
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_script_holder.h b/engines/wintermute/base/base_script_holder.h index 4162936ded..4f3d5f4ef9 100644 --- a/engines/wintermute/base/base_script_holder.h +++ b/engines/wintermute/base/base_script_holder.h @@ -33,7 +33,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseScriptHolder : public BaseScriptable {
public:
@@ -71,6 +71,6 @@ public: virtual bool sendEvent(const char *eventName);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_scriptable.cpp b/engines/wintermute/base/base_scriptable.cpp index 11092427be..6e5b30f7b6 100644 --- a/engines/wintermute/base/base_scriptable.cpp +++ b/engines/wintermute/base/base_scriptable.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseScriptable, false)
@@ -188,4 +188,4 @@ ScScript *BaseScriptable::invokeMethodThread(const char *methodName) { return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_scriptable.h b/engines/wintermute/base/base_scriptable.h index 6227b84649..2501f34561 100644 --- a/engines/wintermute/base/base_scriptable.h +++ b/engines/wintermute/base/base_scriptable.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_named_object.h"
#include "engines/wintermute/persistent.h"
-namespace WinterMute {
+namespace Wintermute {
class ScValue;
class ScStack;
@@ -78,6 +78,6 @@ BaseScriptable *makeSXObject(BaseGame *inGame, ScStack *stack); BaseScriptable *makeSXStore(BaseGame *inGame);
BaseScriptable *makeSXString(BaseGame *inGame, ScStack *stack);
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp index 6c66b808b7..6fe5be9e11 100644 --- a/engines/wintermute/base/base_sprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -41,7 +41,7 @@ #include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseSprite, false)
@@ -812,4 +812,4 @@ bool BaseSprite::killAllSounds() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h index 952bff0017..a02e69c63f 100644 --- a/engines/wintermute/base/base_sprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -33,7 +33,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/base/base_script_holder.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFrame;
class BaseSurface;
class BaseObject;
@@ -85,6 +85,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp index 2e8774020d..3b5e5e3774 100644 --- a/engines/wintermute/base/base_string_table.cpp +++ b/engines/wintermute/base/base_string_table.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_string_table.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseStringTable::BaseStringTable(BaseGame *inGame) : BaseClass(inGame) {
@@ -252,4 +252,4 @@ bool BaseStringTable::loadFile(const char *filename, bool clearOld) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_string_table.h b/engines/wintermute/base/base_string_table.h index 1bc9047f7f..c8df25810e 100644 --- a/engines/wintermute/base/base_string_table.h +++ b/engines/wintermute/base/base_string_table.h @@ -33,7 +33,7 @@ #include "common/hashmap.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseStringTable : public BaseClass {
public:
@@ -50,6 +50,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 7f527392dc..3ddfd1bb14 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseSubFrame, false)
@@ -652,4 +652,4 @@ bool BaseSubFrame::setSurfaceSimple() { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h index d8027d3ce9..935fb667d4 100644 --- a/engines/wintermute/base/base_sub_frame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseObject;
class BaseSurface;
class BaseSubFrame : public BaseScriptable {
@@ -87,6 +87,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp index e3c3692892..0ff325be7d 100644 --- a/engines/wintermute/base/base_surface_storage.cpp +++ b/engines/wintermute/base/base_surface_storage.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//IMPLEMENT_PERSISTENT(BaseSurfaceStorage, true);
@@ -204,4 +204,4 @@ int BaseSurfaceStorage::surfaceSortCB(const void *arg1, const void *arg2) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_surface_storage.h b/engines/wintermute/base/base_surface_storage.h index c09b0a30ab..f1757b3a32 100644 --- a/engines/wintermute/base/base_surface_storage.h +++ b/engines/wintermute/base/base_surface_storage.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
#include "common/array.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurface;
class BaseSurfaceStorage : public BaseClass {
public:
@@ -52,6 +52,6 @@ public: Common::Array<BaseSurface *> _surfaces;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp index 63a13309fb..d71bce1084 100644 --- a/engines/wintermute/base/base_transition_manager.cpp +++ b/engines/wintermute/base/base_transition_manager.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_transition_manager.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseTransitionMgr::BaseTransitionMgr(BaseGame *inGame) : BaseClass(inGame) {
@@ -133,4 +133,4 @@ bool BaseTransitionMgr::update() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_transition_manager.h b/engines/wintermute/base/base_transition_manager.h index 104f327fb8..412361a543 100644 --- a/engines/wintermute/base/base_transition_manager.h +++ b/engines/wintermute/base/base_transition_manager.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseTransitionMgr : public BaseClass {
public:
@@ -49,6 +49,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp index a6c7eea96e..af36a4fdd7 100644 --- a/engines/wintermute/base/base_viewport.cpp +++ b/engines/wintermute/base/base_viewport.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/base/base_viewport.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseViewport, false)
@@ -95,4 +95,4 @@ int BaseViewport::getHeight() { return _rect.bottom - _rect.top;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_viewport.h b/engines/wintermute/base/base_viewport.h index 33e9448082..1080c1d806 100644 --- a/engines/wintermute/base/base_viewport.h +++ b/engines/wintermute/base/base_viewport.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseObject;
class BaseViewport : public BaseClass {
public:
@@ -50,6 +50,6 @@ private: Rect32 _rect;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp index 93533b4057..2f7450a999 100644 --- a/engines/wintermute/base/file/base_disk_file.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -37,7 +37,7 @@ #include "common/tokenizer.h"
#include "common/config-manager.h"
-namespace WinterMute {
+namespace Wintermute {
void correctSlashes(char *fileName) {
for (size_t i = 0; i < strlen(fileName); i++) {
@@ -196,4 +196,4 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_disk_file.h b/engines/wintermute/base/file/base_disk_file.h index 99a9e8b9a3..8be06199de 100644 --- a/engines/wintermute/base/file/base_disk_file.h +++ b/engines/wintermute/base/file/base_disk_file.h @@ -31,11 +31,11 @@ #include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
Common::SeekableReadStream *openDiskFile(const Common::String &filename);
bool diskFileExists(const Common::String &filename);
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_file.cpp b/engines/wintermute/base/file/base_file.cpp index 185a21ad57..f2a347ee0f 100644 --- a/engines/wintermute/base/file/base_file.cpp +++ b/engines/wintermute/base/file/base_file.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/file/base_file.h"
#include "common/memstream.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -65,4 +65,4 @@ Common::SeekableReadStream *BaseFile::getMemStream() { }
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_file.h b/engines/wintermute/base/file/base_file.h index 0c1ab2a045..f9947fe64f 100644 --- a/engines/wintermute/base/file/base_file.h +++ b/engines/wintermute/base/file/base_file.h @@ -38,7 +38,7 @@ namespace Common { class SeekableReadStream;
}
-namespace WinterMute {
+namespace Wintermute {
class BaseFile {
protected:
@@ -62,6 +62,6 @@ public: virtual Common::SeekableReadStream *getMemStream();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp index a08d55db43..82ddf7c90e 100644 --- a/engines/wintermute/base/file/base_file_entry.cpp +++ b/engines/wintermute/base/file/base_file_entry.cpp @@ -32,7 +32,7 @@ #include "common/substream.h"
#include "common/zlib.h"
-namespace WinterMute {
+namespace Wintermute {
Common::SeekableReadStream *BaseFileEntry::createReadStream() const {
Common::SeekableReadStream *file = _package->getFilePointer();
@@ -70,4 +70,4 @@ BaseFileEntry::~BaseFileEntry() { _package = NULL; // ref only
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_file_entry.h b/engines/wintermute/base/file/base_file_entry.h index b94a6cd9fc..7e71a486ef 100644 --- a/engines/wintermute/base/file/base_file_entry.h +++ b/engines/wintermute/base/file/base_file_entry.h @@ -33,7 +33,7 @@ #include "common/str.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class BasePackage;
@@ -55,6 +55,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp index ab74810d1d..a9fb7f9a68 100644 --- a/engines/wintermute/base/file/base_package.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -34,7 +34,7 @@ #include "common/stream.h"
#include "common/debug.h"
-namespace WinterMute {
+namespace Wintermute {
BasePackage::BasePackage() {
_name = "";
@@ -123,13 +123,13 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool TPackageHeader hdr;
hdr.readFromStream(stream);
if (hdr._magic1 != PACKAGE_MAGIC_1 || hdr._magic2 != PACKAGE_MAGIC_2 || hdr._packageVersion > PACKAGE_VERSION) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, " Invalid header in package file '%s'. Ignoring.", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, " Invalid header in package file '%s'. Ignoring.", filename.c_str());
delete stream;
return;
}
if (hdr._packageVersion != PACKAGE_VERSION) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, " Warning: package file '%s' is outdated.", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, " Warning: package file '%s' is outdated.", filename.c_str());
}
_priority = hdr._priority;
// new in v2
@@ -181,7 +181,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool ((byte *)name)[k] ^= 'D';
}
}
- debugC(kWinterMuteDebugFileAccess, "Package contains %s", name);
+ debugC(kWintermuteDebugFileAccess, "Package contains %s", name);
Common::String upcName = name;
upcName.toUppercase();
@@ -222,7 +222,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool }
}
}
- debugC(kWinterMuteDebugFileAccess, " Registered %d files in %d package(s)", _files.size(), _packages.size());
+ debugC(kWintermuteDebugFileAccess, " Registered %d files in %d package(s)", _files.size(), _packages.size());
delete stream;
}
@@ -273,4 +273,4 @@ Common::SeekableReadStream *PackageSet::createReadStreamForMember(const Common:: return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h index a562229f65..676675b041 100644 --- a/engines/wintermute/base/file/base_package.h +++ b/engines/wintermute/base/file/base_package.h @@ -33,7 +33,7 @@ #include "common/stream.h"
#include "common/fs.h"
-namespace WinterMute {
+namespace Wintermute {
class BasePackage {
public:
Common::SeekableReadStream *getFilePointer();
@@ -85,6 +85,6 @@ private: Common::HashMap<Common::String, Common::ArchiveMemberPtr>::iterator _filesIter;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_resources.cpp b/engines/wintermute/base/file/base_resources.cpp index aac5436071..a8bda164dc 100644 --- a/engines/wintermute/base/file/base_resources.cpp +++ b/engines/wintermute/base/file/base_resources.cpp @@ -30,7 +30,7 @@ #include "common/str.h"
#include "common/memstream.h"
-namespace WinterMute {
+namespace Wintermute {
unsigned char invalid[] = {
0x42, 0x4d, 0x36, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x04, 0x00, 0x00, 0x28, 0x00,
@@ -2827,4 +2827,4 @@ bool BaseResources::hasFile(const Common::String &filename) { return false;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_resources.h b/engines/wintermute/base/file/base_resources.h index 2ccab6996f..596ac64dd7 100644 --- a/engines/wintermute/base/file/base_resources.h +++ b/engines/wintermute/base/file/base_resources.h @@ -32,7 +32,7 @@ #include "common/stream.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseResources {
public:
@@ -40,6 +40,6 @@ public: static bool hasFile(const Common::String &filename);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp index 1f7288a6ff..515d8870d7 100644 --- a/engines/wintermute/base/file/base_save_thumb_file.cpp +++ b/engines/wintermute/base/file/base_save_thumb_file.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/file/base_save_thumb_file.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -151,4 +151,4 @@ bool BaseSaveThumbFile::seek(uint32 pos, int whence) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_save_thumb_file.h b/engines/wintermute/base/file/base_save_thumb_file.h index d95958d95f..e68dc06904 100644 --- a/engines/wintermute/base/file/base_save_thumb_file.h +++ b/engines/wintermute/base/file/base_save_thumb_file.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/file/base_file.h"
-namespace WinterMute {
+namespace Wintermute {
//TODO: Get rid of this
class BaseSaveThumbFile : public BaseFile {
@@ -47,6 +47,6 @@ private: byte *_data;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h index ccebc5909c..42c0b75e55 100644 --- a/engines/wintermute/base/file/dcpackage.h +++ b/engines/wintermute/base/file/dcpackage.h @@ -37,7 +37,7 @@ #include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
struct TPackageHeader {
uint32 _magic1;
@@ -75,6 +75,6 @@ v2: uint32 TimeDate1 */
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // _DCPACKAGE_H_
diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp index fa9242366e..198b1ae308 100644 --- a/engines/wintermute/base/font/base_font.cpp +++ b/engines/wintermute/base/font/base_font.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_parser.h"
#include "engines/wintermute/base/base_file_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -204,4 +204,4 @@ bool BaseFont::isTrueType(BaseGame *gameRef, const Common::String &filename) { return ret;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font.h b/engines/wintermute/base/font/base_font.h index f1dc962565..e4413e3410 100644 --- a/engines/wintermute/base/font/base_font.h +++ b/engines/wintermute/base/font/base_font.h @@ -33,7 +33,7 @@ #define NUM_CHARACTERS 256
-namespace WinterMute {
+namespace Wintermute {
class BaseFont: public BaseObject {
public:
@@ -56,6 +56,6 @@ private: static bool isTrueType(BaseGame *game, const Common::String &filename);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 6585d7cb0a..0913ac9b53 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -38,7 +38,7 @@ #include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -586,4 +586,4 @@ int BaseFontBitmap::getLetterHeight() { return _tileHeight;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font_bitmap.h b/engines/wintermute/base/font/base_font_bitmap.h index fb992d2e9a..0b873855bb 100644 --- a/engines/wintermute/base/font/base_font_bitmap.h +++ b/engines/wintermute/base/font/base_font_bitmap.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/font/base_font.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSubFrame;
class BaseFontBitmap : public BaseFont {
public:
@@ -66,6 +66,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp index 0c34a8822a..bc7ab6f22c 100644 --- a/engines/wintermute/base/font/base_font_storage.cpp +++ b/engines/wintermute/base/font/base_font_storage.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -139,4 +139,4 @@ bool BaseFontStorage::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font_storage.h b/engines/wintermute/base/font/base_font_storage.h index 3a39617c32..498096a5a8 100644 --- a/engines/wintermute/base/font/base_font_storage.h +++ b/engines/wintermute/base/font/base_font_storage.h @@ -34,7 +34,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFont;
@@ -50,6 +50,6 @@ public: bool initLoop();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 4fa5ac08ce..ced279dcc8 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -43,7 +43,7 @@ #include "graphics/fontman.h"
#include <limits.h>
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseFontTT, false)
@@ -198,7 +198,7 @@ void BaseFontTT::drawText(byte *text, int x, int y, int width, TTextAlign align, // not found, create one
if (!surface) {
- debugC(kWinterMuteDebugFont, "Draw text: %s", text);
+ debugC(kWintermuteDebugFont, "Draw text: %s", text);
surface = renderTextToTexture(textStr, width, align, maxHeight, textOffset);
if (surface) {
// write surface to cache
@@ -264,7 +264,7 @@ BaseSurface *BaseFontTT::renderTextToTexture(const WideString &text, int width, alignment = Graphics::kTextAlignRight;
}
- debugC(kWinterMuteDebugFont, "%s %d %d %d %d", text.c_str(), RGBCOLGetR(_layers[0]->_color), RGBCOLGetG(_layers[0]->_color), RGBCOLGetB(_layers[0]->_color), RGBCOLGetA(_layers[0]->_color));
+ debugC(kWintermuteDebugFont, "%s %d %d %d %d", text.c_str(), RGBCOLGetR(_layers[0]->_color), RGBCOLGetG(_layers[0]->_color), RGBCOLGetB(_layers[0]->_color), RGBCOLGetA(_layers[0]->_color));
// void drawString(Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;
Graphics::Surface *surface = new Graphics::Surface();
if (_deletableFont) { // We actually have a TTF
@@ -602,4 +602,4 @@ void BaseFontTT::measureText(const WideString &text, int maxWidth, int maxHeight }*/
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h index a893e70ec0..fc4de30fc5 100644 --- a/engines/wintermute/base/font/base_font_truetype.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -38,7 +38,7 @@ #define NUM_CACHED_TEXTS 30
-namespace WinterMute {
+namespace Wintermute {
class BaseFontTT : public BaseFont {
private:
@@ -147,6 +147,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index c1b6636237..ec52e26c00 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -38,7 +38,7 @@ #include "common/stream.h"
#include "common/system.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseImage::BaseImage() {
@@ -69,7 +69,7 @@ bool BaseImage::loadFile(const Common::String &filename) { } else if (_filename.hasSuffix(".bmp")) {
_decoder = new Graphics::BitmapDecoder();
} else if (_filename.hasSuffix(".tga")) {
- _decoder = new WinterMute::TGA();
+ _decoder = new Wintermute::TGA();
} else if (_filename.hasSuffix(".jpg")) {
_decoder = new Graphics::JPEGDecoder();
} else {
@@ -228,4 +228,4 @@ bool BaseImage::copyFrom(BaseImage *origImage, int newWidth, int newHeight) { return true;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index 76a389977d..7bf901fe40 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -36,7 +36,7 @@ #include "common/str.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurface;
class BaseFileManager;
class BaseImage {
@@ -67,6 +67,6 @@ private: BaseFileManager *_fileManager;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index 5d81c44c25..47a5462452 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -34,7 +34,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseRenderer::BaseRenderer(BaseGame *inGame) : BaseClass(inGame) {
@@ -373,4 +373,4 @@ bool BaseRenderer::displayIndicator() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 49b5e187eb..aa8812254d 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -34,7 +34,7 @@ #include "common/rect.h"
#include "common/array.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseImage;
class BaseActiveRect;
@@ -215,6 +215,6 @@ private: BaseRenderer *makeOSystemRenderer(BaseGame *inGame); // Implemented in BRenderSDL.cpp
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp index 28ac4e6973..cbd665591a 100644 --- a/engines/wintermute/base/gfx/base_surface.cpp +++ b/engines/wintermute/base/gfx/base_surface.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseSurface::BaseSurface(BaseGame *inGame) : BaseClass(inGame) {
@@ -146,4 +146,4 @@ void BaseSurface::setSize(int width, int height) { _height = height;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index 57a51ce3aa..3be61477ba 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -33,7 +33,7 @@ #include "engines/wintermute/math/rect32.h"
#include "graphics/surface.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurface: public BaseClass {
public:
@@ -94,6 +94,6 @@ protected: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index ab4e690458..201c881122 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -38,7 +38,7 @@ #include "common/queue.h"
#include "common/config-manager.h"
-namespace WinterMute {
+namespace Wintermute {
RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY, bool disableAlpha) : _owner(owner),
_srcRect(*srcRect), _dstRect(*dstRect), _drawNum(0), _isValid(true), _wantsDraw(true), _hasAlpha(!disableAlpha) {
@@ -602,4 +602,4 @@ BaseSurface *BaseRenderOSystem::createSurface() { return new BaseSurfaceOSystem(_gameRef);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h index 070ddf9241..5859fec74e 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h @@ -34,7 +34,7 @@ #include "graphics/surface.h"
#include "common/list.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurfaceOSystem;
class RenderTicket {
Graphics::Surface *_surface;
@@ -125,6 +125,6 @@ private: uint32 _clearColor;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_BRENDERER_SDL_H
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index 400bb1de41..5b0f7c94c3 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -43,7 +43,7 @@ #include "common/stream.h"
#include "common/system.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseSurfaceOSystem::BaseSurfaceOSystem(BaseGame *inGame) : BaseSurface(inGame) {
@@ -426,4 +426,4 @@ bool BaseSurfaceOSystem::putSurface(const Graphics::Surface &surface, bool hasAl return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h index fe1d055026..27f9ad047e 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/gfx/base_surface.h"
#include "common/list.h"
-namespace WinterMute {
+namespace Wintermute {
struct TransparentSurface;
class BaseImage;
class BaseSurfaceOSystem : public BaseSurface {
@@ -94,6 +94,6 @@ private: byte *_alphaMask;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_BSURFACESDL_H
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index ced01b7fd9..d6006528a2 100644 --- a/engines/wintermute/base/particles/part_emitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -40,7 +40,7 @@ #include "common/str.h"
#include "common/math.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(PartEmitter, false)
@@ -1253,4 +1253,4 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h index 438dfff521..dd02cf7f17 100644 --- a/engines/wintermute/base/particles/part_emitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/base/particles/part_force.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseRegion;
class PartParticle;
class PartEmitter : public BaseObject {
@@ -135,6 +135,6 @@ private: BaseArray<char *> _sprites;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp index 7b2f117b4f..abbaa2819d 100644 --- a/engines/wintermute/base/particles/part_force.cpp +++ b/engines/wintermute/base/particles/part_force.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/particles/part_force.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
PartForce::PartForce(BaseGame *inGame) : BaseNamedObject(inGame) {
@@ -62,4 +62,4 @@ bool PartForce::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/particles/part_force.h b/engines/wintermute/base/particles/part_force.h index ec79ab7238..6903a919e9 100644 --- a/engines/wintermute/base/particles/part_force.h +++ b/engines/wintermute/base/particles/part_force.h @@ -34,7 +34,7 @@ #include "engines/wintermute/base/base_named_object.h"
#include "engines/wintermute/math/vector2.h"
-namespace WinterMute {
+namespace Wintermute {
class PartForce : public BaseNamedObject {
public:
@@ -52,6 +52,6 @@ public: bool persist(BasePersistenceManager *PersistMgr);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp index 1a449a50a5..9247514ac3 100644 --- a/engines/wintermute/base/particles/part_particle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
PartParticle::PartParticle(BaseGame *inGame) : BaseClass(inGame) {
@@ -266,4 +266,4 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/particles/part_particle.h b/engines/wintermute/base/particles/part_particle.h index 44da85a559..3c8fc2c68b 100644 --- a/engines/wintermute/base/particles/part_particle.h +++ b/engines/wintermute/base/particles/part_particle.h @@ -34,7 +34,7 @@ #include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/math/vector2.h"
-namespace WinterMute {
+namespace Wintermute {
class PartEmitter;
class BaseSprite;
@@ -85,6 +85,6 @@ private: int _fadeStartAlpha;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp index fe987c0b2a..06e9fd2565 100644 --- a/engines/wintermute/base/saveload.cpp +++ b/engines/wintermute/base/saveload.cpp @@ -40,7 +40,7 @@ #include "common/savefile.h" #include "common/config-manager.h" -namespace WinterMute { +namespace Wintermute { bool SaveLoad::loadGame(const Common::String &filename, BaseGame *gameRef) { gameRef->LOG(0, "Loading game '%s'...", filename.c_str()); @@ -159,7 +159,7 @@ Common::String SaveLoad::getSaveSlotFilename(int slot) { BasePersistenceManager *pm = new BasePersistenceManager(); Common::String filename = pm->getFilenameForSlot(slot); delete pm; - debugC(kWinterMuteDebugSaveGame, "getSaveSlotFileName(%d) = %s", slot, filename.c_str()); + debugC(kWintermuteDebugSaveGame, "getSaveSlotFileName(%d) = %s", slot, filename.c_str()); return filename; } @@ -194,10 +194,10 @@ bool SaveLoad::isSaveSlotUsed(int slot) { bool SaveLoad::emptySaveSlot(int slot) { Common::String filename = getSaveSlotFilename(slot); BasePersistenceManager *pm = new BasePersistenceManager(); - ((WinterMuteEngine *)g_engine)->getSaveFileMan()->removeSavefile(pm->getFilenameForSlot(slot)); + ((WintermuteEngine *)g_engine)->getSaveFileMan()->removeSavefile(pm->getFilenameForSlot(slot)); delete pm; return true; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/saveload.h b/engines/wintermute/base/saveload.h index 59cdceb038..e448cc8814 100644 --- a/engines/wintermute/base/saveload.h +++ b/engines/wintermute/base/saveload.h @@ -31,7 +31,7 @@ #include "common/str.h" -namespace WinterMute { +namespace Wintermute { class BaseGame; class SaveLoad { public: @@ -52,6 +52,6 @@ private: static void afterLoadScript(void *script, void *data); }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/scriptables/dcscript.h b/engines/wintermute/base/scriptables/dcscript.h index 9610ebf94c..db63ad2b87 100644 --- a/engines/wintermute/base/scriptables/dcscript.h +++ b/engines/wintermute/base/scriptables/dcscript.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_DCSCRIPT_H
#define WINTERMUTE_DCSCRIPT_H
-namespace WinterMute {
+namespace Wintermute {
#define SCRIPT_MAGIC 0xDEC0ADDE
#define SCRIPT_VERSION 0x0102
@@ -136,6 +136,6 @@ typedef enum { ELEMENT_STRING = 0
} TElementType;
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index fb77225700..6c8a88adb0 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/memstream.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(ScScript, false)
@@ -1464,4 +1464,4 @@ void ScScript::afterLoad() { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h index 9f49fac994..132f1ce6c5 100644 --- a/engines/wintermute/base/scriptables/script.h +++ b/engines/wintermute/base/scriptables/script.h @@ -34,7 +34,7 @@ #include "engines/wintermute/base/scriptables/dcscript.h" // Added by ClassView
#include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseScriptHolder;
class BaseObject;
class ScEngine;
@@ -169,6 +169,6 @@ public: virtual const char *dbgGetFilename();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index a1f246c4bc..8765fb9864 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(ScEngine, true)
@@ -608,4 +608,4 @@ void ScEngine::dumpStats() { }*/
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h index 9aae8be85b..f526353368 100644 --- a/engines/wintermute/base/scriptables/script_engine.h +++ b/engines/wintermute/base/scriptables/script_engine.h @@ -33,7 +33,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
#define MAX_CACHED_SCRIPTS 20
class ScScript;
@@ -130,6 +130,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_array.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp index a422d6d8a5..c8d4f64ae9 100644 --- a/engines/wintermute/base/scriptables/script_ext_array.cpp +++ b/engines/wintermute/base/scriptables/script_ext_array.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/system/sys_instance.h"
#include "engines/wintermute/base/scriptables/script_ext_array.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXArray, false)
@@ -249,4 +249,4 @@ bool SXArray::push(ScValue *val) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_array.h b/engines/wintermute/base/scriptables/script_ext_array.h index f2718f4ea2..614f829950 100644 --- a/engines/wintermute/base/scriptables/script_ext_array.h +++ b/engines/wintermute/base/scriptables/script_ext_array.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXArray : public BaseScriptable {
public:
@@ -51,6 +51,6 @@ private: Common::String _strRep;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_date.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp index 72f41c83cc..b5acc7d389 100644 --- a/engines/wintermute/base/scriptables/script_ext_date.cpp +++ b/engines/wintermute/base/scriptables/script_ext_date.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/scriptables/script_ext_date.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXDate, false)
@@ -291,4 +291,4 @@ int SXDate::scCompare(BaseScriptable *Value) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_date.h b/engines/wintermute/base/scriptables/script_ext_date.h index 69fe1f1ae5..521b7a9f8a 100644 --- a/engines/wintermute/base/scriptables/script_ext_date.h +++ b/engines/wintermute/base/scriptables/script_ext_date.h @@ -32,7 +32,7 @@ #include "common/system.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXDate : public BaseScriptable {
public:
@@ -50,6 +50,6 @@ private: Common::String _strRep;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 50d89921e1..53d551119d 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -40,7 +40,7 @@ // Note: This code is completely untested, as I have yet to find a game that uses SXFile.
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXFile, false)
@@ -826,4 +826,4 @@ Common::WriteStream *SXFile::openForAppend(const Common::String &filename, bool error("SXFile::openForAppend - WriteFiles not supported");
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_file.h b/engines/wintermute/base/scriptables/script_ext_file.h index d083f96a4a..389974a48e 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.h +++ b/engines/wintermute/base/scriptables/script_ext_file.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_scriptable.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFile;
@@ -61,6 +61,6 @@ private: Common::WriteStream *openForAppend(const Common::String &filename, bool binary);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_math.cpp b/engines/wintermute/base/scriptables/script_ext_math.cpp index 6b80da6389..906d807275 100644 --- a/engines/wintermute/base/scriptables/script_ext_math.cpp +++ b/engines/wintermute/base/scriptables/script_ext_math.cpp @@ -33,7 +33,7 @@ #include "common/math.h"
#include <cmath>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -292,4 +292,4 @@ bool SXMath::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_math.h b/engines/wintermute/base/scriptables/script_ext_math.h index 393342e5ca..b195c0785d 100644 --- a/engines/wintermute/base/scriptables/script_ext_math.h +++ b/engines/wintermute/base/scriptables/script_ext_math.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXMath : public BaseScriptable {
public:
@@ -48,6 +48,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index 557d9b9b57..eef1931d8b 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h"
#include "common/file.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXMemBuffer, false)
@@ -526,4 +526,4 @@ int SXMemBuffer::scCompare(BaseScriptable *val) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h index b5428b4bd9..0a16167b58 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXMemBuffer : public BaseScriptable {
public:
@@ -55,6 +55,6 @@ private: bool checkBounds(ScScript *script, int start, int length);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_object.cpp b/engines/wintermute/base/scriptables/script_ext_object.cpp index ab7296b1ce..40c9b885cd 100644 --- a/engines/wintermute/base/scriptables/script_ext_object.cpp +++ b/engines/wintermute/base/scriptables/script_ext_object.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -64,4 +64,4 @@ bool SXObject::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_object.h b/engines/wintermute/base/scriptables/script_ext_object.h index f7d3a7bc0f..32aa00776e 100644 --- a/engines/wintermute/base/scriptables/script_ext_object.h +++ b/engines/wintermute/base/scriptables/script_ext_object.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_object.h"
-namespace WinterMute {
+namespace Wintermute {
class SXObject : public BaseObject {
public:
@@ -41,6 +41,6 @@ public: virtual ~SXObject();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index adbf16611c..9bcfe28bbf 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -35,7 +35,7 @@ #include "engines/wintermute/utils/string_util.h"
#include "common/tokenizer.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXString, false)
@@ -433,4 +433,4 @@ int SXString::scCompare(BaseScriptable *val) { return strcmp(_string, ((SXString *)val)->_string);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_string.h b/engines/wintermute/base/scriptables/script_ext_string.h index 9a3bbfc80b..c2de3860ed 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.h +++ b/engines/wintermute/base/scriptables/script_ext_string.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXString : public BaseScriptable {
public:
@@ -53,6 +53,6 @@ private: int _capacity;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 9b3a0201ac..7e81cdaf17 100644 --- a/engines/wintermute/base/scriptables/script_stack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(ScStack, false)
@@ -229,4 +229,4 @@ bool ScStack::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_stack.h b/engines/wintermute/base/scriptables/script_stack.h index 95839cc680..0e2adae518 100644 --- a/engines/wintermute/base/scriptables/script_stack.h +++ b/engines/wintermute/base/scriptables/script_stack.h @@ -34,7 +34,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
-namespace WinterMute {
+namespace Wintermute {
class ScValue;
class BaseScriptable;
@@ -61,6 +61,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp index d35f85f9a1..03ca69ac7e 100644 --- a/engines/wintermute/base/scriptables/script_value.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -34,7 +34,7 @@ #include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -992,4 +992,4 @@ bool ScValue::setProperty(const char *propName) { return ret;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_value.h b/engines/wintermute/base/scriptables/script_value.h index c8d04168b3..af31014bac 100644 --- a/engines/wintermute/base/scriptables/script_value.h +++ b/engines/wintermute/base/scriptables/script_value.h @@ -35,7 +35,7 @@ #include "engines/wintermute/base/scriptables/dcscript.h" // Added by ClassView
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
class ScScript;
class BaseScriptable;
@@ -108,6 +108,6 @@ public: bool setProperty(const char *propName);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp index 7e32552d08..aac68baccd 100644 --- a/engines/wintermute/base/sound/base_sound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/sound/base_sound_manager.h"
#include "engines/wintermute/base/sound/base_sound_buffer.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseSound, false)
@@ -289,4 +289,4 @@ bool BaseSound::applyFX(TSFXType type, float param1, float param2, float param3, return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h index cadba77bc8..fcc463ed06 100644 --- a/engines/wintermute/base/sound/base_sound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -34,7 +34,7 @@ #include "engines/wintermute/persistent.h"
#include "audio/mixer.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSoundBuffer;
class BaseSound : public BaseClass {
@@ -82,6 +82,6 @@ private: BaseSoundBuffer *_sound;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index ac329704bc..14bbcd9421 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -41,7 +41,7 @@ #include "common/system.h"
#include "common/substream.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -93,7 +93,7 @@ void BaseSoundBuffer::setStreaming(bool streamed, uint32 numBlocks, uint32 block //////////////////////////////////////////////////////////////////////////
bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceReload) {
- debugC(kWinterMuteDebugAudio, "BSoundBuffer::LoadFromFile(%s,%d)", filename.c_str(), forceReload);
+ debugC(kWintermuteDebugAudio, "BSoundBuffer::LoadFromFile(%s,%d)", filename.c_str(), forceReload);
// Load a file, but avoid having the File-manager handle the disposal of it.
_file = BaseFileManager::getEngineInstance()->openFile(filename, true, false);
@@ -290,4 +290,4 @@ bool BaseSoundBuffer::applyFX(TSFXType type, float param1, float param2, float p return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 7aec144283..3ec4d4d28b 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -39,7 +39,7 @@ class SeekableAudioStream; class SoundHandle;
}
-namespace WinterMute {
+namespace Wintermute {
class BaseFile;
class BaseSoundBuffer : public BaseClass {
@@ -95,6 +95,6 @@ private: int _volume;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index 95b7d040ab..2bfe0499f9 100644 --- a/engines/wintermute/base/sound/base_sound_manager.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -37,7 +37,7 @@ #include "common/config-manager.h"
#include "audio/mixer.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -279,4 +279,4 @@ float BaseSoundMgr::posToPan(int x, int y) { return minPan + relPos * (maxPan - minPan);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/sound/base_sound_manager.h b/engines/wintermute/base/sound/base_sound_manager.h index a2b8f2c9e9..a0b9a4bc4b 100644 --- a/engines/wintermute/base/sound/base_sound_manager.h +++ b/engines/wintermute/base/sound/base_sound_manager.h @@ -34,7 +34,7 @@ #include "audio/mixer.h"
#include "common/array.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSoundBuffer;
class BaseSoundMgr : public BaseClass {
public:
@@ -63,6 +63,6 @@ public: void saveSettings();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
|