From eb16c831e9560d60e1a3e0e9b0fe688613609409 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 2 Feb 2014 10:29:07 +0100 Subject: AVALANCHE: Fix a couple of missing initializations in the ghost room --- engines/avalanche/ghostroom.cpp | 18 ++++++++++++++---- 1 file 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() { -- cgit v1.2.3