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

[megath at users.sourceforge.net]

Revision: 46905
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46905&view=rev
Author:   megath
Date:     2010-01-02 22:40:17 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
do not show logo while loading save

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

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2010-01-02 22:32:24 UTC (rev 46904)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2010-01-02 22:40:17 UTC (rev 46905)
@@ -313,7 +313,10 @@
 	Common::EventManager *_event = _system->getEventManager();
 
 	initGraphics(320, 200, false);
-	if (!showLogo("unlogic.res"))
+
+	int load_slot = Common::ConfigManager::instance().getInt("save_slot");
+	
+	if (load_slot < 0 && !showLogo("unlogic.res"))
 		return Common::kNoError;
 
 	scene = new Scene;
@@ -334,16 +337,12 @@
 	_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, music, -1, 255, 0, true, false);
 	music->start();
 
-	{
-		int load_slot = Common::ConfigManager::instance().getInt("save_slot");
-		debug(0, "slot: %d", load_slot);
-		if (load_slot >= 0) {
-			loadGameState(load_slot);
-		} else {
-			scene->intro = true;
-			scene_busy = true;
-			processCallback(0x24c);
-		}
+	if (load_slot >= 0) {
+		loadGameState(load_slot);
+	} else {
+		scene->intro = true;
+		scene_busy = true;
+		processCallback(0x24c);
 	}
 
 	uint32 frame = 0;


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