diff options
-rw-r--r-- | engines/wintermute/Ad/AdGame.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/Ad/AdScene.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/Base/BFileManager.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/Base/BGame.cpp | 38 | ||||
-rw-r--r-- | engines/wintermute/Base/BGame.h | 8 | ||||
-rw-r--r-- | engines/wintermute/Base/BSprite.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/Base/BSurfaceStorage.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/Base/file/BSaveThumbFile.cpp | 6 | ||||
-rw-r--r-- | engines/wintermute/wintermute.cpp | 2 |
9 files changed, 33 insertions, 33 deletions
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp index 953dd92179..b5c049dc75 100644 --- a/engines/wintermute/Ad/AdGame.cpp +++ b/engines/wintermute/Ad/AdGame.cpp @@ -266,7 +266,7 @@ ERRORCODE CAdGame::changeScene(const char *filename, bool fadeIn) { if (_scene->_scProp) _scene->_scProp->cleanup();
ERRORCODE ret;
- if (_initialScene && _dEBUG_DebugMode && _debugStartupScene) {
+ if (_initialScene && _debugDebugMode && _debugStartupScene) {
_initialScene = false;
ret = _scene->loadFile(_debugStartupScene);
} else ret = _scene->loadFile(filename);
@@ -2039,7 +2039,7 @@ ERRORCODE CAdGame::onMouseRightUp() { //////////////////////////////////////////////////////////////////////////
ERRORCODE CAdGame::displayDebugInfo() {
char str[100];
- if (_gameRef->_dEBUG_DebugMode) {
+ if (_gameRef->_debugDebugMode) {
sprintf(str, "Mouse: %d, %d (scene: %d, %d)", _mousePos.x, _mousePos.y, _mousePos.x + _scene->getOffsetLeft(), _mousePos.y + _scene->getOffsetTop());
_systemFont->drawText((byte *)str, 0, 90, _renderer->_width, TAL_RIGHT);
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index f50b854db3..e72b3211de 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -295,7 +295,7 @@ float CAdScene::getZoomAt(int x, int y) { //////////////////////////////////////////////////////////////////////////
uint32 CAdScene::getAlphaAt(int x, int y, bool colorCheck) {
- if (!_gameRef->_dEBUG_DebugMode) colorCheck = false;
+ if (!_gameRef->_debugDebugMode) colorCheck = false;
uint32 ret;
if (colorCheck) ret = 0xFFFF0000;
diff --git a/engines/wintermute/Base/BFileManager.cpp b/engines/wintermute/Base/BFileManager.cpp index e652ff8301..113dbbe5d0 100644 --- a/engines/wintermute/Base/BFileManager.cpp +++ b/engines/wintermute/Base/BFileManager.cpp @@ -616,7 +616,7 @@ Common::SeekableReadStream *CBFileManager::openFile(const Common::String &filena if (strcmp(filename.c_str(), "") == 0) return NULL;
//_gameRef->LOG(0, "open file: %s", filename);
/*#ifdef __WIN32__
- if (_gameRef->_dEBUG_DebugMode && _gameRef->_dEBUG_AbsolutePathWarning && AbsPathWarning) {
+ if (_gameRef->_debugDebugMode && _gameRef->_debugAbsolutePathWarning && AbsPathWarning) {
char Drive[_MAX_DRIVE];
_splitpath(filename, Drive, NULL, NULL, NULL);
if (Drive[0] != '\0') {
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 4abfdf4507..4acd916e94 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -100,10 +100,10 @@ CBGame::CBGame(): CBObject(this) { _mathClass = NULL;
- _dEBUG_LogFile = NULL;
- _dEBUG_DebugMode = false;
- _dEBUG_AbsolutePathWarning = true;
- _dEBUG_ShowFPS = false;
+ _debugLogFile = NULL;
+ _debugDebugMode = false;
+ _debugAbsolutePathWarning = true;
+ _debugShowFPS = false;
_systemFont = NULL;
_videoFont = NULL;
@@ -506,7 +506,7 @@ ERRORCODE CBGame::initialize3() { // renderer is initialized //////////////////////////////////////////////////////////////////////
void CBGame::DEBUG_DebugEnable(const char *filename) {
- _dEBUG_DebugMode = true;
+ _debugDebugMode = true;
/* time_t timeNow;
time(&timeNow);
@@ -540,12 +540,12 @@ void CBGame::DEBUG_DebugEnable(const char *filename) { //////////////////////////////////////////////////////////////////////
void CBGame::DEBUG_DebugDisable() {
- if (_dEBUG_LogFile != NULL) {
+ if (_debugLogFile != NULL) {
LOG(0, "********** DEBUG LOG CLOSED ********************************************");
- //fclose((FILE *)_dEBUG_LogFile);
- _dEBUG_LogFile = NULL;
+ //fclose((FILE *)_debugLogFile);
+ _debugLogFile = NULL;
}
- _dEBUG_DebugMode = false;
+ _debugDebugMode = false;
}
@@ -572,8 +572,8 @@ void CBGame::LOG(ERRORCODE res, const char *fmt, ...) { debugCN(kWinterMuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
- //fprintf((FILE *)_dEBUG_LogFile, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
- //fflush((FILE *)_dEBUG_LogFile);
+ //fprintf((FILE *)_debugLogFile, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
+ //fflush((FILE *)_debugLogFile);
//QuickMessage(buff);
}
@@ -2257,7 +2257,7 @@ CScValue *CBGame::scGetProperty(const char *name) { // DebugMode (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "DebugMode") == 0) {
- _scValue->setBool(_dEBUG_DebugMode);
+ _scValue->setBool(_debugDebugMode);
return _scValue;
}
@@ -3242,7 +3242,7 @@ ERRORCODE CBGame::loadGame(const char *filename) { _indicatorDisplay = true;
_indicatorProgress = 0;
CBPersistMgr *pm = new CBPersistMgr(_gameRef);
- _dEBUG_AbsolutePathWarning = false;
+ _debugAbsolutePathWarning = false;
if (DID_FAIL(ret = pm->initLoad(filename))) goto load_finish;
//if(DID_FAIL(ret = cleanup())) goto load_finish;
@@ -3260,7 +3260,7 @@ ERRORCODE CBGame::loadGame(const char *filename) { getDebugMgr()->onGameInit();
load_finish:
- _dEBUG_AbsolutePathWarning = true;
+ _debugAbsolutePathWarning = true;
_indicatorDisplay = false;
delete pm;
@@ -3836,14 +3836,14 @@ ERRORCODE CBGame::getSaveSlotDescription(int slot, char *buffer) { CBPersistMgr *pm = new CBPersistMgr(_gameRef);
if (!pm) return STATUS_FAILED;
- _dEBUG_AbsolutePathWarning = false;
+ _debugAbsolutePathWarning = false;
if (DID_FAIL(pm->initLoad(filename))) {
- _dEBUG_AbsolutePathWarning = true;
+ _debugAbsolutePathWarning = true;
delete pm;
return STATUS_FAILED;
}
- _dEBUG_AbsolutePathWarning = true;
+ _debugAbsolutePathWarning = true;
strcpy(buffer, pm->_savedDescription);
delete pm;
@@ -4318,12 +4318,12 @@ ERRORCODE CBGame::onWindowClose() { ERRORCODE CBGame::displayDebugInfo() {
char str[100];
- if (_dEBUG_ShowFPS) {
+ if (_debugShowFPS) {
sprintf(str, "FPS: %d", _gameRef->_fps);
_systemFont->drawText((byte *)str, 0, 0, 100, TAL_LEFT);
}
- if (_gameRef->_dEBUG_DebugMode) {
+ if (_gameRef->_debugDebugMode) {
if (!_gameRef->_renderer->_windowed)
sprintf(str, "Mode: %dx%dx%d", _renderer->_width, _renderer->_height, _renderer->_bPP);
else
diff --git a/engines/wintermute/Base/BGame.h b/engines/wintermute/Base/BGame.h index 3bee3d134b..e78fd80118 100644 --- a/engines/wintermute/Base/BGame.h +++ b/engines/wintermute/Base/BGame.h @@ -97,7 +97,7 @@ public: bool _shuttingDown;
virtual ERRORCODE displayDebugInfo();
- bool _dEBUG_ShowFPS;
+ bool _debugShowFPS;
bool _suspendedRendering;
int _soundBufferSizeSec;
@@ -185,10 +185,10 @@ public: virtual ~CBGame();
void DEBUG_DebugDisable();
void DEBUG_DebugEnable(const char *filename = NULL);
- bool _dEBUG_DebugMode;
- bool _dEBUG_AbsolutePathWarning;
+ bool _debugDebugMode;
+ bool _debugAbsolutePathWarning;
- void *_dEBUG_LogFile;
+ void *_debugLogFile;
int _sequence;
virtual ERRORCODE loadFile(const char *filename);
virtual ERRORCODE loadBuffer(byte *buffer, bool complete = true);
diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp index d2dd619517..2e6787d27b 100644 --- a/engines/wintermute/Base/BSprite.cpp +++ b/engines/wintermute/Base/BSprite.cpp @@ -126,7 +126,7 @@ ERRORCODE CBSprite::loadFile(const char *filename, int lifeTime, TSpriteCacheTyp Common::SeekableReadStream *file = _gameRef->_fileManager->openFile(filename);
if (!file) {
_gameRef->LOG(0, "CBSprite::LoadFile failed for file '%s'", filename);
- if (_gameRef->_dEBUG_DebugMode) return loadFile("invalid_debug.bmp", lifeTime, cacheType);
+ if (_gameRef->_debugDebugMode) return loadFile("invalid_debug.bmp", lifeTime, cacheType);
else return loadFile("invalid.bmp", lifeTime, cacheType);
} else {
_gameRef->_fileManager->closeFile(file);
diff --git a/engines/wintermute/Base/BSurfaceStorage.cpp b/engines/wintermute/Base/BSurfaceStorage.cpp index cb48f3657b..0ffeb7a81c 100644 --- a/engines/wintermute/Base/BSurfaceStorage.cpp +++ b/engines/wintermute/Base/BSurfaceStorage.cpp @@ -107,7 +107,7 @@ CBSurface *CBSurfaceStorage::addSurface(const char *filename, bool defaultCK, by if (!_gameRef->_fileManager->hasFile(filename)) {
if (filename) _gameRef->LOG(0, "Missing image: '%s'", filename);
- if (_gameRef->_dEBUG_DebugMode)
+ if (_gameRef->_debugDebugMode)
return addSurface("invalid_debug.bmp", defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded);
else
return addSurface("invalid.bmp", defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded);
diff --git a/engines/wintermute/Base/file/BSaveThumbFile.cpp b/engines/wintermute/Base/file/BSaveThumbFile.cpp index 3768578987..1784c1f53d 100644 --- a/engines/wintermute/Base/file/BSaveThumbFile.cpp +++ b/engines/wintermute/Base/file/BSaveThumbFile.cpp @@ -74,13 +74,13 @@ ERRORCODE CBSaveThumbFile::open(const Common::String &filename) { CBPersistMgr *pm = new CBPersistMgr(_gameRef);
if (!pm) return STATUS_FAILED;
- _gameRef->_dEBUG_AbsolutePathWarning = false;
+ _gameRef->_debugAbsolutePathWarning = false;
if (DID_FAIL(pm->initLoad(slotFilename))) {
- _gameRef->_dEBUG_AbsolutePathWarning = true;
+ _gameRef->_debugAbsolutePathWarning = true;
delete pm;
return STATUS_FAILED;
}
- _gameRef->_dEBUG_AbsolutePathWarning = true;
+ _gameRef->_debugAbsolutePathWarning = true;
ERRORCODE res;
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp index ceea7128cf..60abe21cc6 100644 --- a/engines/wintermute/wintermute.cpp +++ b/engines/wintermute/wintermute.cpp @@ -176,7 +176,7 @@ int WinterMuteEngine::init() { if (_game->_registry->readBool("Debug", "DebugMode")) _game->DEBUG_DebugEnable("./wme.log"); - _game->_dEBUG_ShowFPS = _game->_registry->readBool("Debug", "ShowFPS"); + _game->_debugShowFPS = _game->_registry->readBool("Debug", "ShowFPS"); if (_game->_registry->readBool("Debug", "DisableSmartCache")) { _game->LOG(0, "Smart cache is DISABLED"); |