diff options
| -rw-r--r-- | engines/avalanche/acci2.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/avalanche.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/dropdown2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/gyro2.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/trip6.cpp | 7 | ||||
| -rw-r--r-- | engines/avalanche/trip6.h | 2 |
8 files changed, 20 insertions, 9 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 520b2a8e99..8f852ddb60 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1320,8 +1320,8 @@ void Acci::doThat() { if ((_verb != kVerbCodeLoad) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeQuit) && (_verb != kVerbCodeInfo) && (_verb != kVerbCodeHelp) - && (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart) && (_verb != kVerbCodeDir) - && (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) { + && (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart) + && (_verb != kVerbCodeDir) && (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) { if (!_vm->_gyro->alive) { _vm->_scrolls->display(Common::String("You're dead, so don't talk. What are you, a ghost or something? Try restarting, or restoring a saved game!")); return; diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index 9af099bd2b..605932be57 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -62,7 +62,6 @@ AvalancheEngine::~AvalancheEngine() { delete _parser; delete _avalot; - delete _gyro; delete _pingo; delete _scrolls; delete _visa; @@ -75,6 +74,7 @@ AvalancheEngine::~AvalancheEngine() { delete _acci; delete _dropdown; delete _closing; + delete _gyro; } Common::ErrorCode AvalancheEngine::initialize() { diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp index 793fc91114..d15bebb0d0 100644 --- a/engines/avalanche/dropdown2.cpp +++ b/engines/avalanche/dropdown2.cpp @@ -615,12 +615,14 @@ void Dropdown::runMenuAction() { } break; case 1: + _vm->_acci->_thing = _vm->_acci->kPardon; _vm->_lucerna->callverb(_vm->_acci->kVerbCodePause); break; case 2: _vm->_lucerna->callverb(_vm->_acci->kVerbCodeOpen); break; case 3: + _vm->_acci->_thing = _vm->_acci->kPardon; _vm->_lucerna->callverb(_vm->_acci->kVerbCodeLook); break; case 4: diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp index 62ffca81d8..aa28f20031 100644 --- a/engines/avalanche/gyro2.cpp +++ b/engines/avalanche/gyro2.cpp @@ -331,6 +331,7 @@ void Gyro::newgame() { dna.obj[bell - 1] = true; dna.obj[clothes - 1] = true; + thinkthing = true; thinks = 2; _vm->_lucerna->objectlist(); ontoolbar = false; @@ -383,8 +384,7 @@ bool Gyro::flagset(char x) { } void Gyro::force_numlock() { - if ((locks & numlockCode) > 0) - locks -= numlockCode; + warning("STUB: Gyro::force_numlock()"); } bool Gyro::pennycheck(uint16 howmuchby) { diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index 2fce07f9f7..e7ef5a1df5 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -1071,8 +1071,8 @@ void Lucerna::checkclick() { Common::Point cursorPos = _vm->getMousePos(); _vm->_gyro->ontoolbar = _vm->_gyro->slow_computer && ((cursorPos.y >= 169) || (cursorPos.y <= 10)); - if (_vm->_gyro->mrelease > 0) - _vm->_gyro->after_the_scroll = false; + /*if (_vm->_gyro->mrelease > 0) + _vm->_gyro->after_the_scroll = false;*/ if ((0 <= cursorPos.y) && (cursorPos.y <= 21)) _vm->_gyro->newpointer(1); // up arrow diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 143dd19a4b..62b8b5e215 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -461,8 +461,8 @@ void Scrolls::drawscroll(func2 gotoit) { // This is one of the oldest procs in t CursorMan.showMouse(true); //settextjustify(0, 0); // sink resetscrolldriver(); - if (_vm->_gyro->mpress > 0) - _vm->_gyro->after_the_scroll = true; + /*if (_vm->_gyro->mpress > 0) + _vm->_gyro->after_the_scroll = true;*/ warning("STUB: Scrolls::drawscroll()"); } diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp index 3f9c66c79a..2444d432e5 100644 --- a/engines/avalanche/trip6.cpp +++ b/engines/avalanche/trip6.cpp @@ -460,6 +460,13 @@ Trip::Trip(AvalancheEngine *vm) { mustexclaim = false; } +Trip::~Trip() { + for (byte i = 0; i < numtr; i++) { + if (tr[i].quick) + tr[i].done(); + } +} + void Trip::loadtrip() { for (int16 gm = 0; gm < numtr; gm++) tr[gm].original(); diff --git a/engines/avalanche/trip6.h b/engines/avalanche/trip6.h index 1c5c6db19a..e3ed44fe43 100644 --- a/engines/avalanche/trip6.h +++ b/engines/avalanche/trip6.h @@ -182,6 +182,8 @@ public: Trip(AvalancheEngine *vm); + ~Trip(); + void trippancy_link(); void get_back_loretta(); |