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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Fri Jan 29 23:56:39 CET 2010


Revision: 47687
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47687&view=rev
Author:   thebluegr
Date:     2010-01-29 22:56:39 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
_gui and _gui32 are now properly initialized

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-01-29 22:51:22 UTC (rev 47686)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-01-29 22:56:39 UTC (rev 47687)
@@ -167,12 +167,17 @@
 		return Common::kUnknownError;
 
 #ifdef ENABLE_SCI32
-	if (getSciVersion() >= SCI_VERSION_2)
+	if (getSciVersion() >= SCI_VERSION_2) {
+		_gamestate->_gui = 0;
 		_gamestate->_gui32 = new SciGui32(_gamestate, screen, palette, cursor);
-	else
+	} else {
+		_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor, _audio);
+		_gamestate->_gui32 = 0;
+	}
+#else
+	_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor, _audio);
+	_gamestate->_gui32 = 0;
 #endif
-		_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor, _audio);
-		
 
 	if (game_init(_gamestate)) { /* Initialize */
 		warning("Game initialization failed: Aborting...");


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