thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DIRECTOR: LINGO: Don't load movie in b_window

Browse source 
The visibility needs to be set without loading the movie.
This commit is contained in:
djsrv 2020-07-09 20:07:12 -04:00
parent ab53345dc8
commit f04cd38da4
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/director/lingo/lingo-builtins.cpp
View file

@ -2199,7 +2199,7 @@ void LB::b_window(int nargs) {
Stage *window = new Stage(wm->getNextId(), false, false, false, wm, g_director);
window->setName(windowName);
window->resize(1, 1, true);
window->setVisible(false);
window->setVisible(false, true);
wm->addWindowInitialized(window);
windowList->push_back(window);
g_lingo->push(window);

4
engines/director/stage.cpp
View file

@ -290,9 +290,9 @@ Common::Point Stage::getMousePos() {
return g_system->getEventManager()->getMousePos() - Common::Point(_innerDims.left, _innerDims.top);
}
void Stage::setVisible(bool visible) {
void Stage::setVisible(bool visible, bool silent) {
// setting visible triggers movie load
if (!_currentMovie) {
if (!_currentMovie && !silent) {
Common::String movieName = getName();
setNextMovie(movieName);
}

2
engines/director/stage.h
View file

@ -114,7 +114,7 @@ class Stage : public Graphics::MacWindow, public Object<Stage> {
Movie *getCurrentMovie() const { return _currentMovie; }
Common::String getCurrentPath() const { return _currentPath; }
virtual void setVisible(bool visible);
virtual void setVisible(bool visible, bool silent = false);
bool setNextMovie(Common::String &movieFilenameRaw);
bool step();