libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GOB: Don't mess with the break key in Urban Runner

Browse Source 
To be able ESC videos, you need to switch on ESC in the settings
in the right part of the menu, because the scripts needs to
trigger the drawing of the last frame of the ESC'd video.
Otherwise, the graphics e.g. stops mid-frame during a turn.

svn-id: r55407
This commit is contained in:
Sven Hesse 2011-01-22 04:39:39 +00:00
parent e7006f2cf1
commit d99ca6e58c
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/gob/videoplayer.cpp
View File

@ -263,8 +263,10 @@ bool VideoPlayer::play(int slot, Properties &properties) {
return true;
}
// NOTE: For testing (and comfort?) purposes, we enable aborting of all videos)
properties.breakKey = kShortKeyEscape;
if (_vm->getGameType() != kGameTypeUrban)
// NOTE: For testing (and comfort?) purposes, we enable aborting of all videos.
// Except for Urban Runner, where it leads to glitches
properties.breakKey = kShortKeyEscape;
while ((properties.startFrame != properties.lastFrame) &&
(properties.startFrame < (int32)(video->decoder->getFrameCount() - 1))) {
@ -495,7 +497,21 @@ void VideoPlayer::checkAbort(Video &video, Properties &properties) {
&_vm->_global->_inter_mouseY, &_vm->_game->_mouseButtons);
_vm->_inter->storeKey(_vm->_util->checkKey());
if (VAR(0) == (unsigned) properties.breakKey) {
// Check for that specific key
bool pressedBreak = (VAR(0) == (unsigned)properties.breakKey);
// Mouse buttons
if (properties.breakKey < 4)
if (_vm->_game->_mouseButtons & properties.breakKey)
pressedBreak = true;
// Any key
if (properties.breakKey == 4)
if (VAR(0) != 0)
pressedBreak = true;
if (pressedBreak) {
video.decoder->disableSound();
// Seek to the last frame. Some scripts depend on that.