diff options
| author | Einar Johan Trøan Sømåen | 2012-08-15 02:35:11 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-15 02:35:11 +0200 |
| commit | 10ca0f136d120677d776981fc58aba548181c033 (patch) | |
| tree | eca31e7969523315935882e1d5c11be6f8e67110 | |
| parent | e01dc47414355937d98b1de11151dde7c1c12a00 (diff) | |
| download | scummvm-rg350-10ca0f136d120677d776981fc58aba548181c033.tar.gz scummvm-rg350-10ca0f136d120677d776981fc58aba548181c033.tar.bz2 scummvm-rg350-10ca0f136d120677d776981fc58aba548181c033.zip | |
WINTERMUTE: Clear out some commented-out code.
| -rw-r--r-- | engines/wintermute/base/base_game.cpp | 10 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 1 | ||||
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_buffer.cpp | 1 | ||||
| -rw-r--r-- | engines/wintermute/video/video_theora_player.h | 1 |
4 files changed, 1 insertions, 12 deletions
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index 568e6dc6fd..acb20b2454 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -477,15 +477,6 @@ bool BaseGame::initialize3() { // renderer is initialized void BaseGame::DEBUG_DebugEnable(const char *filename) {
_debugDebugMode = true;
- /* time_t timeNow;
- time(&timeNow);
- struct tm *tm = localtime(&timeNow);
-
- #ifdef _DEBUG
- LOG(0, "********** DEBUG LOG OPENED %02d-%02d-%04d (Debug Build) *******************", tm->tm_mday, tm->tm_mon, tm->tm_year + 1900);
- #else
- LOG(0, "********** DEBUG LOG OPENED %02d-%02d-%04d (Release Build) *****************", tm->tm_mday, tm->tm_mon, tm->tm_year + 1900);
- #endif*/
int secs = g_system->getMillis() / 1000;
int hours = secs / 3600;
secs = secs % 3600;
@@ -499,7 +490,6 @@ void BaseGame::DEBUG_DebugEnable(const char *filename) { #endif
LOG(0, "%s ver %d.%d.%d%s, Compiled on " __DATE__ ", " __TIME__, DCGF_NAME, DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, DCGF_VER_SUFFIX);
- //LOG(0, "Extensions: %s ver %d.%02d", EXT_NAME, EXT_VER_MAJOR, EXT_VER_MINOR);
AnsiString platform = BasePlatform::getPlatformName();
LOG(0, "Platform: %s", platform.c_str());
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index 8765fb9864..575e24a3a3 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -312,7 +312,6 @@ bool ScEngine::tick() { break;
}
default:
- //warning("ScEngine::Tick - Unhandled enum");
break;
} // switch
} // for each script
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index b94f0d8215..bb4d5ba375 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -156,6 +156,7 @@ bool BaseSoundBuffer::play(bool looping, uint32 startSample) { //////////////////////////////////////////////////////////////////////////
void BaseSoundBuffer::setLooping(bool looping) {
if (isPlaying()) {
+ // This warning is here, to see if this is ever the case.
warning("BSoundBuffer::SetLooping(%d) - won't change a playing sound", looping); // TODO
}
_looping = looping;
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h index cd358381f1..41b45d2289 100644 --- a/engines/wintermute/video/video_theora_player.h +++ b/engines/wintermute/video/video_theora_player.h @@ -68,7 +68,6 @@ public: bool play(TVideoPlayback type = VID_PLAY_CENTER, int x = 0, int y = 0, bool freezeGame = false, bool freezeMusic = true, bool looping = false, uint32 startTime = 0, float forceZoom = -1.0f, int volume = -1); bool stop(); bool display(uint32 alpha = 0xFFFFFFFF); - //bool renderFrame(BaseSurface *texture, yuv_buffer *yuv); bool pause(); bool resume(); |