aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-04-20 22:44:56 +0300
committerEugene Sandulenko2014-04-20 23:03:44 +0300
commitf655718b5559682c279941cd41ea612670190c5b (patch)
treec6f9e957e94e5061b0e87c32373cc9917e359749
parent4f05fa6586f2d8784c6fcac9210c215805073910 (diff)
downloadscummvm-rg350-f655718b5559682c279941cd41ea612670190c5b.tar.gz
scummvm-rg350-f655718b5559682c279941cd41ea612670190c5b.tar.bz2
scummvm-rg350-f655718b5559682c279941cd41ea612670190c5b.zip
FULLPIPE: Implement ModalQuery::getQueryResult() and destructor
-rw-r--r--engines/fullpipe/modal.cpp6
-rw-r--r--engines/fullpipe/modal.h4
2 files changed, 9 insertions, 1 deletions
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 563e0f9950..dd5d507299 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1329,6 +1329,12 @@ ModalQuery::ModalQuery() {
_queryResult = -1;
}
+ModalQuery::~ModalQuery() {
+ _bg->_flags &= 0xFFFB;
+ _cancelBtn->_flags &= 0xFFFB;
+ _okBtn->_flags &= 0xFFFB;
+}
+
bool ModalQuery::create(Scene *sc, PtrList *picObjList, int id) {
if (id == PIC_MEX_BGR) {
_bg = sc->getPictureObjectById(PIC_MEX_BGR, 0);
diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h
index 14b64f27a3..d7b5fc2455 100644
--- a/engines/fullpipe/modal.h
+++ b/engines/fullpipe/modal.h
@@ -216,7 +216,7 @@ public:
class ModalQuery : public BaseModalObject {
public:
ModalQuery();
- virtual ~ModalQuery() {}
+ virtual ~ModalQuery();
virtual bool pollEvent() { return true; }
virtual bool handleMessage(ExCommand *message) { return false; }
@@ -225,6 +225,8 @@ public:
virtual void saveload() {}
bool create(Scene *sc, PtrList *picObjList, int picId);
+ int getQueryResult() { return _queryResult; }
+
private:
PtrList *_picObjList;