diff options
| author | Strangerke | 2016-06-14 07:41:00 +0200 |
|---|---|---|
| committer | Strangerke | 2016-06-14 07:43:04 +0200 |
| commit | df02215957ebf220a35995deef9cb745af8f9aac (patch) | |
| tree | a7c0516270297d99ebe4d34ed00d5aa193798752 /engines/pegasus | |
| parent | 95f1e6555c1ff7821834117f2b2983e0d3786344 (diff) | |
| download | scummvm-rg350-df02215957ebf220a35995deef9cb745af8f9aac.tar.gz scummvm-rg350-df02215957ebf220a35995deef9cb745af8f9aac.tar.bz2 scummvm-rg350-df02215957ebf220a35995deef9cb745af8f9aac.zip | |
PEGASUS: Initialize some variables
Diffstat (limited to 'engines/pegasus')
6 files changed, 9 insertions, 1 deletions
diff --git a/engines/pegasus/input.h b/engines/pegasus/input.h index ba6f11dba0..ac5b149413 100644 --- a/engines/pegasus/input.h +++ b/engines/pegasus/input.h @@ -451,7 +451,7 @@ protected: class Tracker : public InputHandler { public: - Tracker() : InputHandler(0) {} + Tracker() : InputHandler(0), _savedHandler(nullptr) {} virtual ~Tracker() {} virtual void handleInput(const Input &, const Hotspot *); diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp index 2ae990d775..54c8b514d1 100644 --- a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp @@ -35,6 +35,8 @@ static const NotificationFlags kMessageDoneFlag = 1; CaldoriaMessages::CaldoriaMessages(Neighborhood *owner, const NotificationID id, NotificationManager *manager) : GameInteraction(kCaldoriaMessagesInteractionID, owner), Notification(id, manager), _messageMovie(kCaldoriaMessagesID) { + _neighborhoodNotification = nullptr; + _messageNumber = 0; } void CaldoriaMessages::openInteraction() { diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp index ff4d1811d0..e0e9e2f22d 100644 --- a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp +++ b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp @@ -32,6 +32,7 @@ namespace Pegasus { CaldoriaMirror::CaldoriaMirror(Neighborhood *owner) : GameInteraction(kCaldoriaMirrorInteractionID, owner) { + _neighborhoodNotification = nullptr; } void CaldoriaMirror::openInteraction() { diff --git a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp index 6a24113465..5c2af3eec2 100644 --- a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp +++ b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp @@ -93,6 +93,7 @@ NoradAlpha::NoradAlpha(InputHandler *nextHandler, PegasusEngine *owner) : Norad( _subControlRoom = kNorad22West; _subPrepFailed = false; + _fillingStationItem = nullptr; setIsItemTaken(kGasCanister); } diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp index 9ea3036024..434b95c978 100644 --- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp +++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp @@ -42,6 +42,9 @@ GlobeTracker::GlobeTracker(Movie *globeMovie, Picture *leftHighlight, Picture *r _rightHighlight = rightHighlight; _upHighlight = upHighlight; _downHighlight = downHighlight; + _trackSpot = nullptr; + _trackTime = -1; + _trackDirection = kTrackDown; } void GlobeTracker::setTrackParameters(const Hotspot *trackSpot, GlobeTrackDirection direction) { diff --git a/engines/pegasus/neighborhood/norad/pressuretracker.cpp b/engines/pegasus/neighborhood/norad/pressuretracker.cpp index 5aac19dcbe..390e3e33b6 100644 --- a/engines/pegasus/neighborhood/norad/pressuretracker.cpp +++ b/engines/pegasus/neighborhood/norad/pressuretracker.cpp @@ -34,6 +34,7 @@ PressureTracker::PressureTracker(PressureDoor *pressureDoor) { _pressureDoor = pressureDoor; _trackSpot = 0; _trackTime = 0; + _trackButton = nullptr; } void PressureTracker::setTrackParameters(const Hotspot *trackSpot, Sprite *trackButton) { |