diff options
| -rw-r--r-- | engines/avalanche/gyro2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/timeout2.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/trip6.cpp | 6 |
5 files changed, 7 insertions, 9 deletions
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h index 3d022fb586..23aa40b640 100644 --- a/engines/avalanche/gyro2.h +++ b/engines/avalanche/gyro2.h @@ -498,7 +498,7 @@ public: Common::String mousetext; /* which:array[0..5] of byte;*/ void *p; - bool weirduint16; + bool weirdword; byte to_do; bool lmo, mousemade; Common::String scroll[15]; diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index 3c1d59c8b3..22ae5b536e 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -44,7 +44,7 @@ #include "avalanche/celer2.h" #include "avalanche/pingo2.h" #include "avalanche/sequence2.h" -#include "avalanche/acci2.h" +//#include "avalanche/acci2.h" //#include "dropdown.h" diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna2.h index 259b639b6f..d4e729aaf4 100644 --- a/engines/avalanche/lucerna2.h +++ b/engines/avalanche/lucerna2.h @@ -37,8 +37,6 @@ class AvalancheEngine; class Lucerna { public: - // Call it where Lucerna is first used. - // Procuded to replace the initizalization part of the original Pascal unit. Lucerna(); void setParent(AvalancheEngine *vm); diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp index fe5e5d966c..b4955f6ed6 100644 --- a/engines/avalanche/timeout2.cpp +++ b/engines/avalanche/timeout2.cpp @@ -507,7 +507,7 @@ void Timeout::buydrinks() { _vm->_visa.dixi('D', 1); /* That'll be thruppence. */ if (_vm->_gyro.pennycheck(3)) /* Pay 3d. */ _vm->_visa.dixi('D', 3); /* Tell 'em you paid up. */ - Acci::have_a_drink(); + _vm->_acci.have_a_drink(); } void Timeout::buywine() { @@ -632,7 +632,7 @@ void Timeout::winning() { do { _vm->_lucerna.checkclick(); } while (!(_vm->_gyro.mrelease == 0)); - _vm->_lucerna.callverb(Acci::vb_score); + _vm->_lucerna.callverb(_vm->_acci.vb_score); _vm->_scrolls.display(" T H E E N D "); _vm->_gyro.lmo = true; } diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp index f0d2abc3d4..5baa73d32e 100644 --- a/engines/avalanche/trip6.cpp +++ b/engines/avalanche/trip6.cpp @@ -64,7 +64,8 @@ void triptype::andexor() { } void triptype::turn(byte whichway) { - if (whichway == 8) face = 0; + if (whichway == 8) + face = 0; else face = whichway; } @@ -346,11 +347,10 @@ byte Trip::geida_ped(byte which) { return geida_ped_result; } -void Trip::catamove(byte ped) +void Trip::catamove(byte ped) { /* When you enter a new position in the catacombs, this procedure should be called. It changes the Also codes so that they may match the picture on the screen. (Coming soon: It draws up the screen, too.) */ -{ warning("Repair array indexes in Trip::catamove()"); |