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

[m_kiewitz at users.sourceforge.net]

Revision: 46294
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46294&view=rev
Author:   m_kiewitz
Date:     2009-12-08 21:22:22 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
SCI: new USE_OLDGFX for switching to oldgui, fixes loading of savedgames under oldgui, oldgui doesn't like calling of setPortPic during loading

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/sci.cpp
    scummvm/trunk/engines/sci/sci.h

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-12-08 21:04:40 UTC (rev 46293)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-12-08 21:22:22 UTC (rev 46294)
@@ -351,8 +351,10 @@
 		s.syncAsSint16LE(picPortTop);
 		s.syncAsSint16LE(picPortLeft);
 
-		if (s.isLoading())
-			_gui->setPortPic(picPortRect, picPortTop, picPortLeft, true);
+		#ifndef USE_OLDGFX
+			if (s.isLoading())
+				_gui->setPortPic(picPortRect, picPortTop, picPortLeft, true);
+		#endif
 	}
 
 	sync_SegManagerPtr(s, resMan, _segMan);

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2009-12-08 21:04:40 UTC (rev 46293)
+++ scummvm/trunk/engines/sci/sci.cpp	2009-12-08 21:22:22 UTC (rev 46294)
@@ -145,9 +145,11 @@
 		return Common::kUnknownError;
 
 #ifdef INCLUDE_OLDGFX
-	// Gui change
-	_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);    // new
-	//_gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor);  // old
+	#ifndef USE_OLDGFX
+		_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);    // new
+	#else
+		_gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor);  // old
+	#endif
 #else
 	_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);
 #endif

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2009-12-08 21:04:40 UTC (rev 46293)
+++ scummvm/trunk/engines/sci/sci.h	2009-12-08 21:22:22 UTC (rev 46294)
@@ -42,6 +42,8 @@
 namespace Sci {
 
 #define INCLUDE_OLDGFX
+// Please uncomment this if you want to use oldgui
+//#define USE_OLDGFX
 
 class Console;
 struct EngineState;


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