diff options
7 files changed, 13 insertions, 24 deletions
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index 94f561997e..1c58da2be9 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -212,7 +212,7 @@ bool BaseFileManager::registerPackages() { // 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++) {
- warning("Should register %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")) {
@@ -227,7 +227,7 @@ bool BaseFileManager::registerPackages() { continue;
}
}
- warning("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));
}
}
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index bc751e6aed..995b996b33 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -127,7 +127,7 @@ Common::String BasePersistenceManager::getFilenameForSlot(int slot) const { void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &desc) {
Common::String filename = getFilenameForSlot(slot);
- warning("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;
@@ -172,7 +172,6 @@ uint32 BasePersistenceManager::getMaxUsedSlot() { bool BasePersistenceManager::getSaveExists(int slot) {
Common::String filename = getFilenameForSlot(slot);
- warning("Trying to list savegame %s in slot %d", filename.c_str(), slot);
if (DID_FAIL(readHeader(filename))) {
return false;
}
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index b41df5f1e2..00ef2ec95c 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -258,8 +258,9 @@ void BaseRenderOSystem::fadeToColor(byte r, byte g, byte b, byte a, Common::Rect // thus we avoid printing it more than once.
static bool hasWarned = false;
if (!hasWarned) {
- warning("BaseRenderOSystem::FadeToColor - Breaks when using dirty rects");
- warning("Implement BaseRenderOSystem::FadeToColor"); // TODO.
+ if (!_disableDirtyRects) {
+ warning("BaseRenderOSystem::FadeToColor - Breaks when using dirty rects");
+ }
hasWarned = true;
}
@@ -489,7 +490,9 @@ void BaseRenderOSystem::drawFromSurface(const Graphics::Surface *surf, Common::R bool BaseRenderOSystem::drawLine(int x1, int y1, int x2, int y2, uint32 color) {
static bool hasWarned = false;
if (!hasWarned) {
- warning("BaseRenderOSystem::DrawLine - not fully ported yet");
+ if (!_disableDirtyRects) {
+ warning("BaseRenderOSystem::DrawLine - doesn't work for dirty rects yet");
+ }
hasWarned = true;
}
byte r = RGBCOLGetR(color);
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index 5e6347fdef..5102d182f9 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -348,14 +348,6 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, float zoomX, flo alpha = renderer->_forceAlphaColor;
}
- // This particular warning is rather messy, as this function is called a ton,
- // thus we avoid printing it more than once.
- static bool hasWarned = false;
- if (!hasWarned) {
- warning("BaseSurfaceOSystem::DrawSprite not fully ported yet"); // TODO.
- hasWarned = true;
- }
-
byte r = RGBCOLGetR(alpha);
byte g = RGBCOLGetG(alpha);
byte b = RGBCOLGetB(alpha);
@@ -363,10 +355,8 @@ bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, float zoomX, flo renderer->setAlphaMod(a);
renderer->setColorMod(r, g, b);
-#if 0
- SDL_SetTextureColorMod(_texture, r, g, b);
- SDL_SetTextureAlphaMod(_texture, a);
+#if 0 // These are kept for reference if BlendMode is reimplemented at some point.
if (alphaDisable) {
SDL_SetTextureBlendMode(_texture, SDL_BLENDMODE_NONE);
} else {
diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h index bb37e55388..7ea9f38f6c 100644 --- a/engines/wintermute/base/sound/base_sound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -80,7 +80,6 @@ private: float _sFXParam3;
float _sFXParam4;
BaseSoundBuffer *_sound;
-
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index 34aee36f1b..aa03609177 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -134,9 +134,6 @@ bool BaseSoundBuffer::loadFromFile(const char *filename, bool forceReload) { //////////////////////////////////////////////////////////////////////////
bool BaseSoundBuffer::play(bool looping, uint32 startSample) {
- if (startSample != 0) {
- warning("BSoundBuffer::Play - Should start playback at %d, but currently we don't", startSample);
- }
if (_handle) {
g_system->getMixer()->stopHandle(*_handle);
delete _handle;
@@ -269,12 +266,14 @@ bool BaseSoundBuffer::setPan(float pan) { //////////////////////////////////////////////////////////////////////////
bool BaseSoundBuffer::applyFX(TSFXType type, float param1, float param2, float param3, float param4) {
- warning("BaseSoundBuffer::ApplyFX - not implemented yet");
+ // This function was already stubbed out in WME Lite, and thus isn't reimplemented here either.
switch (type) {
case SFX_ECHO:
+ //warning("BaseSoundBuffer::ApplyFX(SFX_ECHO, %f, %f, %f, %f) - not implemented yet", param1, param2, param3, param4);
break;
case SFX_REVERB:
+ //warning("BaseSoundBuffer::ApplyFX(SFX_REVERB, %f, %f, %f, %f) - not implemented yet", param1, param2, param3, param4);
break;
default:
diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp index 76d73911b2..fc1531ab9b 100644 --- a/engines/wintermute/persistent.cpp +++ b/engines/wintermute/persistent.cpp @@ -163,7 +163,6 @@ void SystemClassRegistry::registerClasses() { REGISTER_CLASS(UITiledImage, false) REGISTER_CLASS(UIWindow, false) REGISTER_CLASS(VideoTheoraPlayer, false) - warning("TODO: Clean this up at some proper time"); } } |