aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Menshakov2010-01-02 22:40:17 +0000
committerVladimir Menshakov2010-01-02 22:40:17 +0000
commit400958b04562c713e2343901d7a9ad8ee554c354 (patch)
tree99f72c8e4bf5253360e1395636a7626703eb4b3e
parente2d14e0499174fe1769be8c5181cb304c14babe3 (diff)
downloadscummvm-rg350-400958b04562c713e2343901d7a9ad8ee554c354.tar.gz
scummvm-rg350-400958b04562c713e2343901d7a9ad8ee554c354.tar.bz2
scummvm-rg350-400958b04562c713e2343901d7a9ad8ee554c354.zip
do not show logo while loading save
svn-id: r46905
-rw-r--r--engines/teenagent/teenagent.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 7f941f7407..9dda5b248b 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -313,7 +313,10 @@ Common::Error TeenAgentEngine::run() {
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 @@ Common::Error TeenAgentEngine::run() {
_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;