diff options
| author | uruk | 2013-06-25 18:04:52 +0200 |
|---|---|---|
| committer | uruk | 2013-06-25 18:04:52 +0200 |
| commit | 7f1a322de484a8958db46dc34ab134285fc9c886 (patch) | |
| tree | 7800bab83ec89965d5200797ad097ce6d48ff104 /engines/avalanche | |
| parent | c39434f37ee24b44c354dc765ad18309471d394a (diff) | |
| download | scummvm-rg350-7f1a322de484a8958db46dc34ab134285fc9c886.tar.gz scummvm-rg350-7f1a322de484a8958db46dc34ab134285fc9c886.tar.bz2 scummvm-rg350-7f1a322de484a8958db46dc34ab134285fc9c886.zip | |
AVALANCHE: Repair compilation.
Diffstat (limited to 'engines/avalanche')
| -rw-r--r-- | engines/avalanche/avalot.h | 3 | ||||
| -rw-r--r-- | engines/avalanche/enhanced2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/enhanced2.h | 2 | ||||
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 28 |
4 files changed, 20 insertions, 15 deletions
diff --git a/engines/avalanche/avalot.h b/engines/avalanche/avalot.h index 5f109339bd..073b07377b 100644 --- a/engines/avalanche/avalot.h +++ b/engines/avalanche/avalot.h @@ -32,10 +32,9 @@ namespace Avalanche { -bool checkbreak; // Originally located in avalot9.map - class Avalot { private: + bool checkbreak; // Originally located in avalot9.map public: Avalot(); diff --git a/engines/avalanche/enhanced2.cpp b/engines/avalanche/enhanced2.cpp index c5b038861d..7a9a58f50d 100644 --- a/engines/avalanche/enhanced2.cpp +++ b/engines/avalanche/enhanced2.cpp @@ -35,6 +35,7 @@ namespace Avalanche { bool isenh() { warning("STUB: Enhanced::isenh()"); + return true; } void readkeye() { @@ -52,6 +53,7 @@ namespace Avalanche { */ warning("STUB: Enhanced::keypressede()"); + return true; } } // End of namespace Enhanced diff --git a/engines/avalanche/enhanced2.h b/engines/avalanche/enhanced2.h index d696c32a79..98ef781213 100644 --- a/engines/avalanche/enhanced2.h +++ b/engines/avalanche/enhanced2.h @@ -39,7 +39,7 @@ namespace Avalanche { namespace Enhanced { byte shiftstate; /*ABSOLUTE $40:$17;*/ - bool atbios; + bool atbios; // BIOS type char inchar, extd; void readkeye(); diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index cbbd2e187b..57c15a2b8f 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -28,9 +28,10 @@ #include "avalanche/scrolls2.h" #include "avalanche/gyro2.h" #include "avalanche/logger2.h" +#include "avalanche/enhanced2.h" + //#include "lucerna.h" //#include "trip5.h" -//#include "enhanced.h" //#include "Acci.h" //#include "basher.h" //#include "visa.h" @@ -143,7 +144,7 @@ namespace Avalanche { default: { ox += 1; for (yy = 1; yy <= 12; yy ++) itw[yy][ox] = ~ ch[cfont][z[xx]][yy + 1]; - Logger::log_scrollchar(z[xx]); + Logger::log_scrollchar(Common::String(z[xx])); } } } @@ -229,15 +230,19 @@ namespace Avalanche { Gyro::on(); Gyro::newpointer(4); //do { - // do { - // Gyro::check(); /* was "checkclick;" */ - // if (keypressede()) break; - // } while (!(mpress > 0) || buttona1() || buttonb1()); - // - // Needs Enhanced (conatins keypressede()) to proceed. - - - + //do { + // Gyro::check(); /* was "checkclick;" */ + // if (Enhanced::keypressede()) break; + //} while (!(Gyro::mpress > 0) || buttona1() || buttonb1()); + // + // Needs joystick - not sure it will be implemented. + + //if (Gyro::mpress == 0) { + // inkey(); Needs Lucerna to proceed. + // + //} + //} + } @@ -250,7 +255,6 @@ namespace Avalanche { - } // End of namespace Scrolls |