aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1/animation.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-10-16 07:42:23 +0000
committerFilippos Karapetis2009-10-16 07:42:23 +0000
commit422b732dbadde0b23aaec05b39edec9e1c81f91e (patch)
tree80ce8d6063e6e60cd4e273210ac5bf9d66e56136 /engines/sword1/animation.cpp
parent9934b70733f3322e1136d805f927fb0f628d1dfc (diff)
downloadscummvm-rg350-422b732dbadde0b23aaec05b39edec9e1c81f91e.tar.gz
scummvm-rg350-422b732dbadde0b23aaec05b39edec9e1c81f91e.tar.bz2
scummvm-rg350-422b732dbadde0b23aaec05b39edec9e1c81f91e.zip
Added a new convenience method to the video player, which adds the event of skipping videos with the escape key by default, thereby simplifying the video playing code in all places where it's used
svn-id: r45151
Diffstat (limited to 'engines/sword1/animation.cpp')
-rw-r--r--engines/sword1/animation.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 014f5084eb..60e9bb13fa 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -33,9 +33,7 @@
#include "common/config-manager.h"
#include "common/endian.h"
#include "common/str.h"
-#include "common/events.h"
#include "common/system.h"
-#include "common/list.h"
#include "graphics/surface.h"
#include "gui/message.h"
@@ -153,17 +151,10 @@ void MoviePlayer::play(void) {
}
bool terminated = false;
- Common::List<Common::Event> stopEvents;
- Common::Event stopEvent;
- stopEvents.clear();
- stopEvent.type = Common::EVENT_KEYDOWN;
- stopEvent.kbd = Common::KEYCODE_ESCAPE;
- stopEvents.push_back(stopEvent);
-
_textX = 0;
_textY = 0;
- terminated = !playVideo(stopEvents);
+ terminated = !playVideo();
if (terminated)
_snd->stopHandle(*_bgSoundHandle);