aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2013-06-28 12:26:01 +0200
committeruruk2013-06-28 12:26:01 +0200
commit83982503871a042aa113102449f7a6cc8d77aa6c (patch)
tree87f0d068dda739b0aa25261af3db67d8d2679dae
parentc2d3c5fcf80ea88693e7090ab7b5644bd3690a83 (diff)
downloadscummvm-rg350-83982503871a042aa113102449f7a6cc8d77aa6c.tar.gz
scummvm-rg350-83982503871a042aa113102449f7a6cc8d77aa6c.tar.bz2
scummvm-rg350-83982503871a042aa113102449f7a6cc8d77aa6c.zip
AVALANCHE: Repair Enhanced and Gyro.
-rw-r--r--engines/avalanche/enhanced2.cpp5
-rw-r--r--engines/avalanche/enhanced2.h5
-rw-r--r--engines/avalanche/gyro2.h6
3 files changed, 14 insertions, 2 deletions
diff --git a/engines/avalanche/enhanced2.cpp b/engines/avalanche/enhanced2.cpp
index 2ee3f3d0aa..99ddfb4340 100644
--- a/engines/avalanche/enhanced2.cpp
+++ b/engines/avalanche/enhanced2.cpp
@@ -31,6 +31,11 @@
namespace Avalanche {
+void Enhanced::setParent(AvalancheEngine *vm) {
+ _vm = vm;
+}
+
+
bool Enhanced::isenh() {
warning("STUB: Enhanced::isenh()");
return true;
diff --git a/engines/avalanche/enhanced2.h b/engines/avalanche/enhanced2.h
index 2ba42e006f..8dd88a6e93 100644
--- a/engines/avalanche/enhanced2.h
+++ b/engines/avalanche/enhanced2.h
@@ -35,13 +35,18 @@
#include "common/system.h"
namespace Avalanche {
+class AvalancheEngine;
class Enhanced {
public:
+ AvalancheEngine *_vm;
+
byte shiftstate; /*ABSOLUTE $40:$17;*/
bool atbios; // BIOS type
char inchar, extd;
+ void setParent(AvalancheEngine *vm);
+
void readkeye();
bool keypressede();
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index ecea597c8e..c2f6fd7f9b 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -33,11 +33,13 @@
#include "common/system.h"
#include "common/str.h"
#include "common/scummsys.h"
-#include "avalanche/avalanche.h"
+
#include "avalanche/roomnums.h"
#include "avalanche/color.h"
namespace Avalanche {
+class AvalancheEngine;
+
static const char numobjs = 18; /* always preface with a # */
static const int16 maxobjs = 12; /* carry limit */
@@ -617,7 +619,7 @@ public:
Gyro();
- void Gyro::setParent(AvalancheEngine *vm);
+ void setParent(AvalancheEngine *vm);
void newpointer(byte m);