diff options
author | Eugene Sandulenko | 2014-06-18 09:34:32 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2014-06-18 09:37:37 +0300 |
commit | a3e89eb4b20bf0213a9204e88f1772f1e778574f (patch) | |
tree | 49dd7f5adeb839aebc5599966c6382143dd977c4 /engines/fullpipe/modal.cpp | |
parent | fde3e7fc128a75b5f5c0c091588a0c02ab64098e (diff) | |
download | scummvm-rg350-a3e89eb4b20bf0213a9204e88f1772f1e778574f.tar.gz scummvm-rg350-a3e89eb4b20bf0213a9204e88f1772f1e778574f.tar.bz2 scummvm-rg350-a3e89eb4b20bf0213a9204e88f1772f1e778574f.zip |
FULLPIPE: Fixed ModalQuery
Diffstat (limited to 'engines/fullpipe/modal.cpp')
-rw-r--r-- | engines/fullpipe/modal.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index 8e04e312fe..2fd7ef0c21 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -918,7 +918,7 @@ bool ModalMainMenu::init(int counterdiff) { g_fp->_modalObject = mq; mq->_parentObj = this; - mq->create(_scene, (PictureObject *)_scene->_picObjList[0], PIC_MEX_BGR); + mq->create(_scene, _scene, PIC_MEX_BGR); _hoverAreaId = 0; @@ -1318,7 +1318,7 @@ void ModalHelp::launch() { } ModalQuery::ModalQuery() { - _picObjList = 0; + _bgScene = 0; _bg = 0; _okBtn = 0; _cancelBtn = 0; @@ -1331,7 +1331,7 @@ ModalQuery::~ModalQuery() { _okBtn->_flags &= 0xFFFB; } -bool ModalQuery::create(Scene *sc, PictureObject *picObjList, int id) { +bool ModalQuery::create(Scene *sc, Scene *bgScene, int id) { if (id == PIC_MEX_BGR) { _bg = sc->getPictureObjectById(PIC_MEX_BGR, 0); @@ -1368,14 +1368,14 @@ bool ModalQuery::create(Scene *sc, PictureObject *picObjList, int id) { } _queryResult = -1; - _picObjList = picObjList; + _bgScene = bgScene; return true; } void ModalQuery::update() { - if (_picObjList) - _picObjList->draw(); + if (_bgScene) + _bgScene->draw(); _bg->draw(); @@ -1426,9 +1426,12 @@ bool ModalQuery::init(int counterdiff) { _okBtn->_flags &= 0xFFFB; if (_queryResult == 1) { + if (_bgScene) + g_fp->sceneFade(_bgScene, false); + warning("STUB: ModalQuery::init()"); - //sceneFade(g_vrtDrawHandle, (Scene *)this->_picObjList, 0); + // Quit game //if (inputArFlag) { // g_needRestart = 1; // return 0; |