[Scummvm-cvs-logs] scummvm master -> 4ba603807a1ec8ba0b65aff102a8578b1b59fd95

somaen einarjohants at gmail.com
Tue Jan 22 16:26:53 CET 2013


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

Summary:
6a972052ad WINTERMUTE: Remove unneccessary include.
4ba603807a WINTERMUTE: Add a hack to skip a single frame after saving/loading. (Fix Bug: #3592874)


Commit: 6a972052ade7fa931f6db30d553f933927687532
    https://github.com/scummvm/scummvm/commit/6a972052ade7fa931f6db30d553f933927687532
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-22T06:52:54-08:00

Commit Message:
WINTERMUTE: Remove unneccessary include.

Changed paths:
    engines/wintermute/base/sound/base_sound_manager.cpp



diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index f5f1190..432e0a6 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include <math.h>
 #include "engines/wintermute/base/sound/base_sound_manager.h"
 #include "engines/wintermute/base/base_engine.h"
 #include "engines/wintermute/utils/path_util.h"


Commit: 4ba603807a1ec8ba0b65aff102a8578b1b59fd95
    https://github.com/scummvm/scummvm/commit/4ba603807a1ec8ba0b65aff102a8578b1b59fd95
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-22T07:24:49-08:00

Commit Message:
WINTERMUTE: Add a hack to skip a single frame after saving/loading. (Fix Bug: #3592874)

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



diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 097ea7f..df88e3b 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -53,6 +53,7 @@ BaseRenderOSystem::BaseRenderOSystem(BaseGame *inGame) : BaseRenderer(inGame) {
 	_needsFlip = true;
 	_spriteBatch = false;
 	_batchNum = 0;
+	_skipThisFrame = false;
 
 	_borderLeft = _borderRight = _borderTop = _borderBottom = 0;
 	_ratioX = _ratioY = 1.0f;
@@ -155,6 +156,14 @@ bool BaseRenderOSystem::indicatorFlip() {
 }
 
 bool BaseRenderOSystem::flip() {
+	if (_skipThisFrame) {
+		_skipThisFrame = false;
+		delete _dirtyRect;
+		_dirtyRect = NULL;
+		g_system->updateScreen();
+		_needsFlip = false;
+		return true;
+	}
 	if (!_disableDirtyRects) {
 		drawTickets();
 	} else {
@@ -583,6 +592,9 @@ void BaseRenderOSystem::endSaveLoad() {
 		it = _renderQueue.erase(it);
 		delete ticket;
 	}
+	// HACK: After a save the buffer will be drawn before the scripts get to update it,
+	// so just skip this single frame.
+	_skipThisFrame = true;
 	_drawNum = 1;
 }
 
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index e79a0ce..9c36edb 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -112,6 +112,8 @@ private:
 	float _ratioY;
 	uint32 _colorMod;
 	uint32 _clearColor;
+
+	bool _skipThisFrame;
 };
 
 } // end of namespace Wintermute






More information about the Scummvm-git-logs mailing list