aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorTorbjörn Andersson2009-03-07 17:27:18 +0000
committerTorbjörn Andersson2009-03-07 17:27:18 +0000
commit041af01f7d2053cad29f022865325602cb44d39b (patch)
tree601043fc18acc95304caef9d7f4ef38e9e34bf51 /engines/sword2
parent950937c4467af993f2b6e7d6afd035434b96743f (diff)
downloadscummvm-rg350-041af01f7d2053cad29f022865325602cb44d39b.tar.gz
scummvm-rg350-041af01f7d2053cad29f022865325602cb44d39b.tar.bz2
scummvm-rg350-041af01f7d2053cad29f022865325602cb44d39b.zip
Don't show a warning dialog for missing cutscenes in the demo. As noted in bug
#2669360, the demo tries to play cutscenes which really aren't there. svn-id: r39194
Diffstat (limited to 'engines/sword2')
-rw-r--r--engines/sword2/animation.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index c35be49865..ab5a6e67a0 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -31,6 +31,7 @@
#include "sword2/sword2.h"
#include "sword2/defs.h"
#include "sword2/header.h"
+#include "sword2/logic.h"
#include "sword2/maketext.h"
#include "sword2/resman.h"
#include "sword2/sound.h"
@@ -348,9 +349,14 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s
return NULL;
}
- sprintf(buf, "Cutscene '%s' not found", name);
- GUI::MessageDialog dialog(buf, "OK");
- dialog.runModal();
+ // The demo tries to play some cutscenes that aren't there, so make
+ // those warnings more discreet.
+ if (!vm->_logic->readVar(DEMO)) {
+ sprintf(buf, "Cutscene '%s' not found", name);
+ GUI::MessageDialog dialog(buf, "OK");
+ dialog.runModal();
+ } else
+ warning("Cutscene '%s' not found", name);
return NULL;
}