[Scummvm-cvs-logs] SF.net SVN: scummvm:[33949] scummvm/branches/gsoc2008-rtl

[cpage88 at users.sourceforge.net]

Revision: 33949
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33949&view=rev
Author:   cpage88
Date:     2008-08-16 22:06:44 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
Made sure to set the loading slot AFTER selecting the active domain when loading from the launcher.  Also fixed the flickering Virgin logo in BASS

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp
    scummvm/branches/gsoc2008-rtl/gui/launcher.cpp

Modified: scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp	2008-08-16 21:51:56 UTC (rev 33948)
+++ scummvm/branches/gsoc2008-rtl/engines/sky/sky.cpp	2008-08-16 22:06:44 UTC (rev 33949)
@@ -298,8 +298,6 @@
 }
 
 void SkyEngine::initVirgin() {
-
-	_skyScreen->setPalette(60111);
 	_skyScreen->showScreen(60110);
 }
 

Modified: scummvm/branches/gsoc2008-rtl/gui/launcher.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/gui/launcher.cpp	2008-08-16 21:51:56 UTC (rev 33948)
+++ scummvm/branches/gsoc2008-rtl/gui/launcher.cpp	2008-08-16 22:06:44 UTC (rev 33949)
@@ -978,8 +978,8 @@
 						const char *file = saveList[idx].filename().c_str();
 						printf("Loading slot: %d\n", slot);
 						printf("Loading file: %s\n", file);
+						ConfMan.setActiveDomain(_domains[item]);
 						ConfMan.setInt("save_slot", slot);
-						ConfMan.setActiveDomain(_domains[item]);
 						close();
 					}
 				}


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