[Scummvm-cvs-logs] scummvm master -> 338c88e5c231dc821f5f7c49d65bb14d3f8e63a1

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
338c88e5c2 WINTERMUTE: Fix incorrect reversion of code in BaseRenderOSystem::drawLine()


Commit: 338c88e5c231dc821f5f7c49d65bb14d3f8e63a1
    https://github.com/scummvm/scummvm/commit/338c88e5c231dc821f5f7c49d65bb14d3f8e63a1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-01-22T14:25:38-08:00

Commit Message:
WINTERMUTE: Fix incorrect reversion of code in BaseRenderOSystem::drawLine()

Changed paths:
    engines/wintermute/base/gfx/osystem/base_render_osystem.cpp



diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 6918baf..d1884a5 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -484,10 +484,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);