[Scummvm-git-logs] scummvm master -> 62ab06645788ef5b99264033382001245648fbbe
dreammaster
dreammaster at scummvm.org
Tue Aug 1 04:39:34 CEST 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a590b8bf0a TITANIC: Only skip cutscenes if standard ASCII keys pressed
62ab066457 TITANIC: Fix not being able to close ScummVM during prologue credits
Commit: a590b8bf0a6750e0051995fe71823dac67f104fd
https://github.com/scummvm/scummvm/commit/a590b8bf0a6750e0051995fe71823dac67f104fd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-31T22:36:01-04:00
Commit Message:
TITANIC: Only skip cutscenes if standard ASCII keys pressed
Changed paths:
engines/titanic/events.h
diff --git a/engines/titanic/events.h b/engines/titanic/events.h
index 430702b..fdf9e91 100644
--- a/engines/titanic/events.h
+++ b/engines/titanic/events.h
@@ -79,7 +79,10 @@ public:
virtual ~CPressTarget() {}
virtual void leftButtonDown(const Point &mousePos) { _pressed = true; }
virtual void middleButtonDown(const Point &mousePos) { _pressed = true; }
- virtual void keyDown(Common::KeyState keyState) { _pressed = true; }
+ virtual void keyDown(Common::KeyState keyState) {
+ if (keyState.ascii)
+ _pressed = true;
+ }
};
class Events {
Commit: 62ab06645788ef5b99264033382001245648fbbe
https://github.com/scummvm/scummvm/commit/62ab06645788ef5b99264033382001245648fbbe
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-31T22:39:28-04:00
Commit Message:
TITANIC: Fix not being able to close ScummVM during prologue credits
Changed paths:
engines/titanic/support/avi_surface.cpp
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 86daeab..7673c37 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -472,7 +472,8 @@ Graphics::ManagedSurface *AVISurface::duplicateTransparency() const {
}
bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) {
- bool isDifferent = false;
+ if (g_vm->shouldQuit())
+ return false;
if (_currentFrame != ((int)startFrame - 1) || startFrame == 0) {
// Start video playback at the desired starting frame
@@ -484,7 +485,7 @@ bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) {
_decoder->start();
}
- isDifferent = _movieFrameSurface[0]->w != r.width() ||
+ bool isDifferent = _movieFrameSurface[0]->w != r.width() ||
_movieFrameSurface[0]->h != r.height();
bool isFinished = true;
@@ -515,7 +516,7 @@ bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) {
}
stop();
- return isFinished;
+ return isFinished && !g_vm->shouldQuit();
}
uint AVISurface::getBitDepth() const {
More information about the Scummvm-git-logs
mailing list