libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 17:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STARK: Don't show the cursor during FMVs

Browse Source
This commit is contained in:
Bastien Bouclet 2018-04-08 19:56:24 +02:00
parent ce355587ba
commit f15f8b3996
7 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/stark/resources/animsoundtrigger.cpp
View File

@ -70,8 +70,9 @@ void AnimSoundTrigger::onGameLoop() {
if (_subType == kAnimTriggerSound) { if (_subType == kAnimTriggerSound) {
Location *location = StarkGlobal->getCurrent()->getLocation(); Location *location = StarkGlobal->getCurrent()->getLocation();
Sound *sound = location->findStockSound(_soundStockType); Sound *sound = location->findStockSound(_soundStockType);
if (sound) { if (sound && !StarkGlobal->isFastForward()) {
// TODO: If the location has a 3D layer set the source position of the sound to the item position // TODO: If the location has a 3D layer set the source position of the sound to the item position
sound->stop();
sound->play(); sound->play();
} }
} else { } else {

2
engines/stark/services/userinterface.cpp
View File

@ -171,8 +171,10 @@ void UserInterface::render() {
_currentScreen->render(); _currentScreen->render();
// The cursor depends on the UI being done. // The cursor depends on the UI being done.
if (_currentScreen->getName() != Screen::kScreenFMV) {
_cursor->render(); _cursor->render();
} }
}
bool UserInterface::isInteractive() const { bool UserInterface::isInteractive() const {
return _interactive; return _interactive;

12
engines/stark/ui/cursor.cpp
View File

@ -43,7 +43,7 @@ Cursor::Cursor(Gfx::Driver *gfx) :
_gfx(gfx), _gfx(gfx),
_cursorImage(nullptr), _cursorImage(nullptr),
_mouseText(nullptr), _mouseText(nullptr),
_currentCursorType(kNone), _currentCursorType(kImage),
_fading(false), _fading(false),
_fadeLevelIncreasing(true), _fadeLevelIncreasing(true),
_fadeLevel(0) { _fadeLevel(0) {
@ -55,24 +55,19 @@ Cursor::~Cursor() {
} }
void Cursor::setCursorType(CursorType type) { void Cursor::setCursorType(CursorType type) {
assert(type != kImage);
if (type == _currentCursorType) { if (type == _currentCursorType) {
return; return;
} }
_currentCursorType = type; _currentCursorType = type;
if (type == kNone) {
_cursorImage = nullptr;
return;
}
_cursorImage = StarkStaticProvider->getCursorImage(_currentCursorType); _cursorImage = StarkStaticProvider->getCursorImage(_currentCursorType);
} }
void Cursor::setCursorImage(VisualImageXMG *image) { void Cursor::setCursorImage(VisualImageXMG *image) {
_currentCursorType = kNone; _currentCursorType = kImage;
_cursorImage = image; _cursorImage = image;
} }
void Cursor::setMousePosition(const Common::Point &pos) { void Cursor::setMousePosition(const Common::Point &pos) {
_mousePos = pos; _mousePos = pos;
} }
@ -100,7 +95,6 @@ void Cursor::updateFadeLevel() {
void Cursor::render() { void Cursor::render() {
updateFadeLevel(); updateFadeLevel();
if (!_gfx->isPosInScreenBounds(_mousePos)) { if (!_gfx->isPosInScreenBounds(_mousePos)) {
setCursorType(Cursor::kPassive); setCursorType(Cursor::kPassive);
} }

2
engines/stark/ui/cursor.h
View File

@ -55,7 +55,7 @@ public:
Common::Point getMousePosition(bool unscaled = false) const; Common::Point getMousePosition(bool unscaled = false) const;
enum CursorType { enum CursorType {
kNone = -1, kImage = -1,
kDefault = 0, kDefault = 0,
kActive = 3, kActive = 3,
kPassive = 9, kPassive = 9,

2
engines/stark/ui/world/fmvscreen.cpp
View File

@ -40,7 +40,7 @@ FMVScreen::FMVScreen(Gfx::Driver *gfx, Cursor *cursor) :
_visible = true; _visible = true;
_decoder = new Video::BinkDecoder(); _decoder = new Video::BinkDecoder();
_decoder->setDefaultHighColorFormat(_gfx->getRGBAPixelFormat()); _decoder->setDefaultHighColorFormat(Gfx::Driver::getRGBAPixelFormat());
_decoder->setSoundType(Audio::Mixer::kSFXSoundType); _decoder->setSoundType(Audio::Mixer::kSFXSoundType);
_texture = _gfx->createTexture(); _texture = _gfx->createTexture();

2
engines/stark/visual/effects/effect.cpp
View File

@ -37,7 +37,7 @@ VisualEffect::VisualEffect(VisualType type, const Common::Point &size, Gfx::Driv
_timeBetweenTwoUpdates(3 * 33), // ms (frames @ 30 fps) _timeBetweenTwoUpdates(3 * 33), // ms (frames @ 30 fps)
_timeRemainingUntilNextUpdate(0) { _timeRemainingUntilNextUpdate(0) {
_surface = new Graphics::Surface(); _surface = new Graphics::Surface();
_surface->create(size.x, size.y, _gfx->getRGBAPixelFormat()); _surface->create(size.x, size.y, Gfx::Driver::getRGBAPixelFormat());
_texture = _gfx->createTexture(_surface); _texture = _gfx->createTexture(_surface);

2
engines/stark/visual/text.cpp
View File

@ -113,7 +113,7 @@ void VisualText::createTexture() {
// Create a surface to render to // Create a surface to render to
Graphics::Surface surface; Graphics::Surface surface;
surface.create(scaledRect.width(), scaledRect.height(), _gfx->getRGBAPixelFormat()); surface.create(scaledRect.width(), scaledRect.height(), Gfx::Driver::getRGBAPixelFormat());
surface.fillRect(scaledRect, _backgroundColor); surface.fillRect(scaledRect, _backgroundColor);
// Render the lines to the surface // Render the lines to the surface