aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus
diff options
context:
space:
mode:
authorStrangerke2016-06-16 07:59:53 +0200
committerStrangerke2016-06-16 07:59:53 +0200
commitfd19d453dde4ede27e2140a286ab29d420177b0d (patch)
tree523a8e995d1f598db89b701976e69cd67dca2a87 /engines/pegasus
parent78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7 (diff)
downloadscummvm-rg350-fd19d453dde4ede27e2140a286ab29d420177b0d.tar.gz
scummvm-rg350-fd19d453dde4ede27e2140a286ab29d420177b0d.tar.bz2
scummvm-rg350-fd19d453dde4ede27e2140a286ab29d420177b0d.zip
PEGASUS: Fix some missing variable initializations
Diffstat (limited to 'engines/pegasus')
-rw-r--r--engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp8
-rw-r--r--engines/pegasus/neighborhood/mars/mars.cpp8
-rw-r--r--engines/pegasus/neighborhood/wsc/wsc.cpp6
3 files changed, 22 insertions, 0 deletions
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
index 688fb7860d..9a2cf8c4bb 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
@@ -104,6 +104,14 @@ static const ExtraID s_shutDownExtras[3][3] = {
Caldoria4DSystem::Caldoria4DSystem(Neighborhood *owner) : GameInteraction(kCaldoria4DInteractionID, owner),
_4DSpritesMovie(kCaldoria4DSpritesID) {
+ _4DSpritesScale = 0;
+ _whichMenu = k4DVideoMenu;
+ _videoChoice = k4DIslandChoice;
+ _audioChoice = k4DRockChoice;
+ _neighborhoodNotification = nullptr;
+ _loopStart = 0;
+ _clickedHotspotID = kNoHotSpotID;
+
g_AIArea->lockAIOut();
}
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 7c4a8a98ba..0d5edd85ba 100644
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -100,6 +100,14 @@ Mars::Mars(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextH
_planetMovie(kNoDisplayElement), _junk(kNoDisplayElement), _energyChoiceSpot(kShuttleEnergySpotID),
_gravitonChoiceSpot(kShuttleGravitonSpotID), _tractorChoiceSpot(kShuttleTractorSpotID),
_shuttleViewSpot(kShuttleViewSpotID), _shuttleTransportSpot(kShuttleTransportSpotID) {
+
+ _reactorStage = 0;
+ _nextGuess = 0;
+ _attackingItem = nullptr;
+ _marsEvent.mars = nullptr;
+ _marsEvent.event = kMarsLaunchTubeReached;
+ _weaponSelection = kNoWeapon;
+
_noAirFuse.setFunctor(new Common::Functor0Mem<void, Mars>(this, &Mars::airStageExpired));
setIsItemTaken(kMarsCard);
setIsItemTaken(kAirMask);
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index 5e35d8ccc1..c907bee289 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -486,6 +486,12 @@ static const CoordType kMoleculesMovieTop = kNavAreaTop + 40;
WSC::WSC(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "WSC", kWSCID),
_moleculesMovie(kNoDisplayElement) {
+
+ _argonSprite = nullptr;
+ _cachedZoomSpot = nullptr;
+ _moleculeGameLevel = 0;
+ _numCorrect = 0;
+
setIsItemTaken(kArgonCanister);
setIsItemTaken(kSinclairKey);
setIsItemTaken(kNitrogenCanister);