From c6df5f99949809fceb998d760ec332ce8626c615 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Tue, 22 Jan 2013 19:53:55 +0100 Subject: WINTERMUTE: Mark drawLine as unused with dirty-rects. --- engines/wintermute/base/gfx/base_renderer.h | 5 +++-- engines/wintermute/base/gfx/osystem/base_render_osystem.cpp | 8 ++++---- 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); -- cgit v1.2.3