[Scummvm-cvs-logs] scummvm master -> 997386d15ca751eaef06533f3edc0aa3d029eede

somaen einarjohan at somadalen.com
Mon Dec 3 11:36:05 CET 2012


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:
997386d15c WINTERMUTE: Enable dirty rects by default.


Commit: 997386d15ca751eaef06533f3edc0aa3d029eede
    https://github.com/scummvm/scummvm/commit/997386d15ca751eaef06533f3edc0aa3d029eede
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2012-12-03T02:33:11-08:00

Commit Message:
WINTERMUTE: Enable dirty rects by default.

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 55556e5..fff51a5 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -106,7 +106,7 @@ BaseRenderOSystem::BaseRenderOSystem(BaseGame *inGame) : BaseRenderer(inGame) {
 	setAlphaMod(255);
 	setColorMod(255, 255, 255);
 	_dirtyRect = NULL;
-	_disableDirtyRects = true;
+	_disableDirtyRects = false;
 	if (ConfMan.hasKey("dirty_rects")) {
 		_disableDirtyRects = !ConfMan.getBool("dirty_rects");
 	}
@@ -263,14 +263,6 @@ void BaseRenderOSystem::fade(uint16 alpha) {
 
 //////////////////////////////////////////////////////////////////////////
 void BaseRenderOSystem::fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect) {
-	// This particular warning is rather messy, as this function is called a ton,
-	// thus we avoid printing it more than once.
-
-	// TODO: Add fading with dirty rects.
-	if (!_disableDirtyRects) {
-		warning("BaseRenderOSystem::FadeToColor - Breaks when using dirty rects");
-	}
-
 	Common::Rect fillRect;
 
 	if (rect) {






More information about the Scummvm-git-logs mailing list