aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche
diff options
context:
space:
mode:
Diffstat (limited to 'engines/avalanche')
-rw-r--r--engines/avalanche/gyro2.cpp5
-rw-r--r--engines/avalanche/gyro2.h4
2 files changed, 2 insertions, 7 deletions
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp
index faafdcd764..8319c17ef7 100644
--- a/engines/avalanche/gyro2.cpp
+++ b/engines/avalanche/gyro2.cpp
@@ -194,7 +194,7 @@ const tunetype Gyro::tune = {
lower, same, lower, higher, same, lower, higher
};
-const byte Gyro::static_const_whereis[29] = {
+byte Gyro::whereis[29] = {
/* The Lads */
r__yours, /* Avvy */
r__spludwicks, /* Spludwick */
@@ -245,9 +245,6 @@ const char Gyro::betterchar[] = "WMBParCLguKeSnIohn";
Gyro::Gyro() : interrogation(0), oncandopageswap(true) {
- for (int i = 0; i < 29; i++)
- whereis[i] = static_const_whereis[i];
-
/* Needed becouse of Lucerna::load_also() */
for (int fv = 0; fv < 31; fv++)
for (int ff = 0; ff < 2; ff++)
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index 5c40b421cb..39fabf8cce 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -460,8 +460,6 @@ public:
static const int16 runerr_getset_overflow = 50;
- static const byte static_const_whereis[29];
-
@@ -472,7 +470,7 @@ public:
the DNA in a position dictated by the value. If a scroll comes up,
or you leave the room, it's automatically set to zero. */
- byte whereis[29];
+ static byte whereis[29];
bool oncandopageswap;
/* Variable static constant for overriding the ability of On to switch pages.