[Scummvm-cvs-logs] SF.net SVN: scummvm: [32214] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Thu May 22 20:30:30 CEST 2008
Revision: 32214
http://scummvm.svn.sourceforge.net/scummvm/?rev=32214&view=rev
Author: drmccoy
Date: 2008-05-22 11:30:29 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Reverting my last commit, as it breaks Gob3 (and probably elsewhere, too)
Modified Paths:
--------------
scummvm/trunk/engines/gob/draw.cpp
scummvm/trunk/engines/gob/draw.h
scummvm/trunk/engines/gob/videoplayer.cpp
Modified: scummvm/trunk/engines/gob/draw.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw.cpp 2008-05-22 17:33:31 UTC (rev 32213)
+++ scummvm/trunk/engines/gob/draw.cpp 2008-05-22 18:30:29 UTC (rev 32214)
@@ -225,7 +225,7 @@
_invalidatedCount++;
}
-void Draw::blitInvalidated(bool noForce) {
+void Draw::blitInvalidated() {
if (_noInvalidated57 &&
((_vm->_global->_videoMode == 5) || (_vm->_global->_videoMode == 7)))
return;
@@ -248,12 +248,8 @@
_showCursor = (_showCursor & ~2) | ((_showCursor & 1) << 1);
if (_applyPal) {
clearPalette();
-
- if (!noForce)
- forceBlit();
-
+ forceBlit();
setPalette();
-
_invalidatedCount = 0;
_noInvalidated = true;
_applyPal = false;
Modified: scummvm/trunk/engines/gob/draw.h
===================================================================
--- scummvm/trunk/engines/gob/draw.h 2008-05-22 17:33:31 UTC (rev 32213)
+++ scummvm/trunk/engines/gob/draw.h 2008-05-22 18:30:29 UTC (rev 32214)
@@ -133,7 +133,7 @@
int16 _scrollOffsetX;
void invalidateRect(int16 left, int16 top, int16 right, int16 bottom);
- void blitInvalidated(bool noForce = false);
+ void blitInvalidated();
void setPalette();
void clearPalette();
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2008-05-22 17:33:31 UTC (rev 32213)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2008-05-22 18:30:29 UTC (rev 32214)
@@ -557,7 +557,7 @@
if (_backSurf) {
_vm->_draw->invalidateRect(state.left, state.top, state.right, state.bottom);
- _vm->_draw->blitInvalidated(palCmd <= 1);
+ _vm->_draw->blitInvalidated();
}
_vm->_video->retrace();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list