[Scummvm-cvs-logs] SF.net SVN: scummvm:[46921] scummvm/trunk/engines/teenagent/teenagent.cpp
megath at users.sourceforge.net
megath at users.sourceforge.net
Sun Jan 3 11:46:18 CET 2010
Revision: 46921
http://scummvm.svn.sourceforge.net/scummvm/?rev=46921&view=rev
Author: megath
Date: 2010-01-03 10:46:14 +0000 (Sun, 03 Jan 2010)
Log Message:
-----------
started music before logo
Modified Paths:
--------------
scummvm/trunk/engines/teenagent/teenagent.cpp
Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp 2010-01-03 10:30:38 UTC (rev 46920)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp 2010-01-03 10:46:14 UTC (rev 46921)
@@ -314,11 +314,6 @@
initGraphics(320, 200, false);
- int load_slot = Common::ConfigManager::instance().getInt("save_slot");
-
- if (load_slot < 0 && !showLogo("unlogic.res"))
- return Common::kNoError;
-
scene = new Scene;
inventory = new Inventory;
console = new Console(this);
@@ -329,7 +324,6 @@
init();
CursorMan.pushCursor(res->dseg.ptr(0x00da), 8, 12, 0, 0, 1);
- CursorMan.showMouse(true);
syncSoundSettings();
@@ -337,14 +331,19 @@
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, music, -1, 255, 0, true, false);
music->start();
+ int load_slot = Common::ConfigManager::instance().getInt("save_slot");
if (load_slot >= 0) {
loadGameState(load_slot);
} else {
+ if (!showLogo("unlogic.res"))
+ return Common::kNoError;
scene->intro = true;
scene_busy = true;
processCallback(0x24c);
}
+ CursorMan.showMouse(true);
+
uint32 frame = 0;
Common::Event event;
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