aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche
diff options
context:
space:
mode:
authorStrangerke2014-02-02 10:29:07 +0100
committerStrangerke2014-02-02 10:29:07 +0100
commiteb16c831e9560d60e1a3e0e9b0fe688613609409 (patch)
treef586844f44d785b370db843b1ed910ea4ae373d0 /engines/avalanche
parent6832352c9b745a3d5fe89ae95ff8332264d75401 (diff)
downloadscummvm-rg350-eb16c831e9560d60e1a3e0e9b0fe688613609409.tar.gz
scummvm-rg350-eb16c831e9560d60e1a3e0e9b0fe688613609409.tar.bz2
scummvm-rg350-eb16c831e9560d60e1a3e0e9b0fe688613609409.zip
AVALANCHE: Fix a couple of missing initializations in the ghost room
Diffstat (limited to 'engines/avalanche')
-rw-r--r--engines/avalanche/ghostroom.cpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/engines/avalanche/ghostroom.cpp b/engines/avalanche/ghostroom.cpp
index ae371181d4..f56fcd202d 100644
--- a/engines/avalanche/ghostroom.cpp
+++ b/engines/avalanche/ghostroom.cpp
@@ -31,17 +31,27 @@
namespace Avalanche {
const int8 GhostRoom::kAdjustment[5] = { 7, 0, 7, 7, 7 };
-
const byte GhostRoom::kPlaneToUse[4] = { 2, 2, 2, 3 };
-
const byte GhostRoom::kWaveOrder[5] = { 5, 1, 2, 3, 4 };
-
const byte GhostRoom::kGlerkFade[26] = { 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1 };
-
const byte GhostRoom::kGreldetFade[18] = { 1, 2, 3, 4, 5, 6, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1 };
GhostRoom::GhostRoom(AvalancheEngine *vm) {
_vm = vm;
+
+ for (int i = 0; i < 5; i++)
+ _greenEyes[i] = nullptr;
+
+ _glerk = nullptr;
+ _gd = _gm = 0;
+ _glerkStage = 0;
+ _aarghCount = 0;
+ _batX = _batY = 0;
+ _batCount = 0;
+ _greldetX = _greldetY = 0;
+ _greldetCount = 0;
+ _gb = false;
+ _redGreldet = false;
}
void GhostRoom::plainGrab() {