aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/gfx
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-01-22 19:53:55 +0100
committerEinar Johan Trøan Sømåen2013-01-22 19:53:55 +0100
commitc6df5f99949809fceb998d760ec332ce8626c615 (patch)
tree1cb5bf301c293d50a9f5c5f703f63830a06a85ad /engines/wintermute/base/gfx
parentd322592037da4bd013a9c1868c0d76d89b487750 (diff)
downloadscummvm-rg350-c6df5f99949809fceb998d760ec332ce8626c615.tar.gz
scummvm-rg350-c6df5f99949809fceb998d760ec332ce8626c615.tar.bz2
scummvm-rg350-c6df5f99949809fceb998d760ec332ce8626c615.zip
WINTERMUTE: Mark drawLine as unused with dirty-rects.
Diffstat (limited to 'engines/wintermute/base/gfx')
-rw-r--r--engines/wintermute/base/gfx/base_renderer.h5
-rw-r--r--engines/wintermute/base/gfx/osystem/base_render_osystem.cpp8
2 files changed, 7 insertions, 6 deletions
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 9027c66a14..796dee8cd1 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -84,8 +84,9 @@ public:
* @param rect the portion of the screen to fade (if NULL, the entire screen will be faded).
*/
virtual void fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect = NULL) = 0;
- virtual bool drawLine(int x1, int y1, int x2, int y2, uint32 color);
- virtual bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1);
+
+ virtual bool drawLine(int x1, int y1, int x2, int y2, uint32 color); // Unused outside indicator-display
+ virtual bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1); // Unused outside indicator-display
BaseRenderer(BaseGame *inGame = NULL);
virtual ~BaseRenderer();
virtual bool setProjection() {
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index df88e3b499..6a27f8da54 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -482,10 +482,10 @@ void BaseRenderOSystem::drawFromSurface(RenderTicket *ticket, Common::Rect *dstR
//////////////////////////////////////////////////////////////////////////
bool BaseRenderOSystem::drawLine(int x1, int y1, int x2, int y2, uint32 color) {
- static bool hasWarned = false; // TODO: Fix this, this only avoids spamming warnings for now.
- if (!_disableDirtyRects && !hasWarned) {
- warning("BaseRenderOSystem::DrawLine - doesn't work for dirty rects yet");
- hasWarned = true;
+ // This function isn't used outside of indicator-displaying, and thus quite unused in
+ // BaseRenderOSystem when dirty-rects are enabled.
+ if (!_disableDirtyRects && !_indicatorDisplay) {
+ error("BaseRenderOSystem::DrawLine - doesn't work for dirty rects yet");
}
byte r = RGBCOLGetR(color);