[Scummvm-cvs-logs] SF.net SVN: scummvm:[47781] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 47781
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47781&view=rev
Author:   m_kiewitz
Date:     2010-01-31 21:59:37 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
SCI: syncWithFramebuffer() is now called directly w/o SciGui/SciGui32

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/graphics/gui.cpp
    scummvm/trunk/engines/sci/graphics/gui.h
    scummvm/trunk/engines/sci/graphics/gui32.cpp
    scummvm/trunk/engines/sci/graphics/gui32.h
    scummvm/trunk/engines/sci/graphics/screen.cpp
    scummvm/trunk/engines/sci/graphics/screen.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-31 21:54:43 UTC (rev 47780)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-31 21:59:37 UTC (rev 47781)
@@ -1206,12 +1206,7 @@
 	}
 
 	if (playedVideo) {
-#ifdef ENABLE_SCI32
-		if (s->_gui32)
-			s->_gui32->syncWithFramebuffer();
-		else
-#endif
-			s->_gui->syncWithFramebuffer();
+		s->_gfxScreen->kernelSyncWithFramebuffer();
 	}
 
 	if (reshowCursor) {

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-31 21:54:43 UTC (rev 47780)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-31 21:59:37 UTC (rev 47781)
@@ -654,10 +654,6 @@
 	_cursor->setMoveZone(zone);
 }
 
-void SciGui::syncWithFramebuffer() {
-	_screen->syncWithFramebuffer();
-}
-
 reg_t SciGui::portraitLoad(Common::String resourceName) {
 	//Portrait *myPortrait = new Portrait(_s->resMan, _screen, _palette, resourceName);
 	return NULL_REG;

Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h	2010-01-31 21:54:43 UTC (rev 47780)
+++ scummvm/trunk/engines/sci/graphics/gui.h	2010-01-31 21:59:37 UTC (rev 47781)
@@ -123,8 +123,6 @@
 	virtual void moveCursor(Common::Point pos);
 	void setCursorZone(Common::Rect zone);
 
-	virtual void syncWithFramebuffer();
-
 	virtual reg_t portraitLoad(Common::String resourceName);
 	virtual void portraitShow(Common::String resourceName, Common::Point position, uint16 resourceNum, uint16 noun, uint16 verb, uint16 cond, uint16 seq);
 	virtual void portraitUnload(uint16 portraitId);

Modified: scummvm/trunk/engines/sci/graphics/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.cpp	2010-01-31 21:54:43 UTC (rev 47780)
+++ scummvm/trunk/engines/sci/graphics/gui32.cpp	2010-01-31 21:59:37 UTC (rev 47781)
@@ -215,10 +215,6 @@
 	_cursor->setMoveZone(zone);
 }
 
-void SciGui32::syncWithFramebuffer() {
-	_screen->syncWithFramebuffer();
-}
-
 void SciGui32::addScreenItem(reg_t object) {
 	_screenItems.push_back(object);
 	warning("addScreenItem %X:%X (%s)", object.segment, object.offset, _s->_segMan->getObjectName(object));

Modified: scummvm/trunk/engines/sci/graphics/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.h	2010-01-31 21:54:43 UTC (rev 47780)
+++ scummvm/trunk/engines/sci/graphics/gui32.h	2010-01-31 21:59:37 UTC (rev 47781)
@@ -64,8 +64,6 @@
 	void moveCursor(Common::Point pos);
 	void setCursorZone(Common::Rect zone);
 
-	void syncWithFramebuffer();
-
 	void addScreenItem(reg_t object);
 	void deleteScreenItem(reg_t object);
 	void addPlane(reg_t object);

Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp	2010-01-31 21:54:43 UTC (rev 47780)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp	2010-01-31 21:59:37 UTC (rev 47781)
@@ -93,7 +93,7 @@
 	g_system->unlockScreen();
 }
 
-void GfxScreen::syncWithFramebuffer() {
+void GfxScreen::kernelSyncWithFramebuffer() {
 	Graphics::Surface *screen = g_system->lockScreen();
 
 	memcpy(_displayScreen, screen->pixels, _displayPixels);

Modified: scummvm/trunk/engines/sci/graphics/screen.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.h	2010-01-31 21:54:43 UTC (rev 47780)
+++ scummvm/trunk/engines/sci/graphics/screen.h	2010-01-31 21:59:37 UTC (rev 47781)
@@ -55,7 +55,7 @@
 
 	void copyToScreen();
 	void copyFromScreen(byte *buffer);
-	void syncWithFramebuffer();
+	void kernelSyncWithFramebuffer();
 	void copyRectToScreen(const Common::Rect &rect);
 	void copyDisplayRectToScreen(const Common::Rect &rect);
 	void copyRectToScreen(const Common::Rect &rect, int16 x, int16 y);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.