[Scummvm-cvs-logs] SF.net SVN: scummvm:[47219] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Sun Jan 10 10:42:55 CET 2010
Revision: 47219
http://scummvm.svn.sourceforge.net/scummvm/?rev=47219&view=rev
Author: m_kiewitz
Date: 2010-01-10 09:42:55 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
SCI: updateBox now also supports hires mode
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/graphics/gfx.cpp
scummvm/trunk/engines/sci/graphics/gfx.h
scummvm/trunk/engines/sci/graphics/gui.cpp
scummvm/trunk/engines/sci/graphics/gui.h
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-01-10 09:07:09 UTC (rev 47218)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-01-10 09:42:55 UTC (rev 47219)
@@ -264,11 +264,13 @@
s->_gui->graphFillBox(rect, colorMask, color, priority, control);
break;
- case K_GRAPH_UPDATE_BOX:
+ case K_GRAPH_UPDATE_BOX: {
kGraphCreateRect(x, y, x1, y1, &rect);
+ bool hiresMode = (argc > 6) ? true : false;
// argc == 7 on upscaled hires
- s->_gui->graphUpdateBox(rect);
+ s->_gui->graphUpdateBox(rect, hiresMode);
break;
+ }
case K_GRAPH_REDRAW_BOX:
kGraphCreateRect(x, y, x1, y1, &rect);
Modified: scummvm/trunk/engines/sci/graphics/gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gfx.cpp 2010-01-10 09:07:09 UTC (rev 47218)
+++ scummvm/trunk/engines/sci/graphics/gfx.cpp 2010-01-10 09:42:55 UTC (rev 47219)
@@ -267,6 +267,10 @@
_screen->copyRectToScreen(workerRect);
}
+void Gfx::BitsShowHires(const Common::Rect &rect) {
+ _screen->copyDisplayRectToScreen(rect);
+}
+
reg_t Gfx::BitsSave(const Common::Rect &rect, byte screenMask) {
reg_t memoryId;
byte *memoryPtr;
Modified: scummvm/trunk/engines/sci/graphics/gfx.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gfx.h 2010-01-10 09:07:09 UTC (rev 47218)
+++ scummvm/trunk/engines/sci/graphics/gfx.h 2010-01-10 09:42:55 UTC (rev 47219)
@@ -78,6 +78,7 @@
void OffsetLine(Common::Point &start, Common::Point &end);
void BitsShow(const Common::Rect &r);
+ void BitsShowHires(const Common::Rect &rect);
reg_t BitsSave(const Common::Rect &rect, byte screenFlags);
void BitsGetRect(reg_t memoryHandle, Common::Rect *destRect);
void BitsRestore(reg_t memoryHandle);
Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp 2010-01-10 09:07:09 UTC (rev 47218)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp 2010-01-10 09:42:55 UTC (rev 47219)
@@ -516,8 +516,11 @@
_gfx->BitsRestore(handle);
}
-void SciGui::graphUpdateBox(Common::Rect rect) {
- _gfx->BitsShow(rect);
+void SciGui::graphUpdateBox(Common::Rect rect, bool hiresMode) {
+ if (!hiresMode)
+ _gfx->BitsShow(rect);
+ else
+ _gfx->BitsShowHires(rect);
}
void SciGui::graphRedrawBox(Common::Rect rect) {
Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h 2010-01-10 09:07:09 UTC (rev 47218)
+++ scummvm/trunk/engines/sci/graphics/gui.h 2010-01-10 09:42:55 UTC (rev 47219)
@@ -104,7 +104,7 @@
virtual reg_t graphSaveBox(Common::Rect rect, uint16 flags);
virtual reg_t graphSaveUpscaledHiresBox(Common::Rect rect);
virtual void graphRestoreBox(reg_t handle);
- virtual void graphUpdateBox(Common::Rect rect);
+ virtual void graphUpdateBox(Common::Rect rect, bool hiresMode);
virtual void graphRedrawBox(Common::Rect rect);
virtual void graphAdjustPriority(int top, int bottom);
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