[Scummvm-cvs-logs] scummvm master -> df02215957ebf220a35995deef9cb745af8f9aac
Strangerke
Strangerke at scummvm.org
Tue Jun 14 07:52:56 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
df02215957 PEGASUS: Initialize some variables
Commit: df02215957ebf220a35995deef9cb745af8f9aac
https://github.com/scummvm/scummvm/commit/df02215957ebf220a35995deef9cb745af8f9aac
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-06-14T07:43:04+02:00
Commit Message:
PEGASUS: Initialize some variables
Changed paths:
engines/pegasus/input.h
engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
engines/pegasus/neighborhood/norad/delta/globegame.cpp
engines/pegasus/neighborhood/norad/pressuretracker.cpp
diff --git a/engines/pegasus/input.h b/engines/pegasus/input.h
index ba6f11d..ac5b149 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 2ae990d..54c8b51 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 ff4d181..e0e9e2f 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 6a24113..5c2af3e 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 9ea3036..434b95c 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 5aac19d..390e3e3 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) {
More information about the Scummvm-git-logs
mailing list