aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/core.h
diff options
context:
space:
mode:
authorStrangerke2013-04-29 10:01:01 +0200
committerStrangerke2013-04-29 10:01:01 +0200
commitb4f5a1a93c9d4b1a6111e3b4cf6ec60bc851c9d7 (patch)
tree6fdd5d70d285745f51bf044f36245f3ec1b48cf6 /engines/tsage/core.h
parenta1c4203fe858f0ef0a227cc87d61aea2fe51f80f (diff)
downloadscummvm-rg350-b4f5a1a93c9d4b1a6111e3b4cf6ec60bc851c9d7.tar.gz
scummvm-rg350-b4f5a1a93c9d4b1a6111e3b4cf6ec60bc851c9d7.tar.bz2
scummvm-rg350-b4f5a1a93c9d4b1a6111e3b4cf6ec60bc851c9d7.zip
TSAGE: Fix some non-initialized variables and missing va_end(). CID 1002102, 1002399, 1002400, 1002402
Diffstat (limited to 'engines/tsage/core.h')
-rw-r--r--engines/tsage/core.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 60a7930eab..296754011e 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -189,7 +189,7 @@ public:
Action *_action;
SceneObject *_sceneObject;
public:
- ObjectMover() { _action = NULL; _sceneObject = NULL; }
+ ObjectMover() { _action = NULL; _sceneObject = NULL; _minorDiff = 0; _majorDiff = 0; _changeCtr = 0;}
virtual ~ObjectMover();
virtual void synchronize(Serializer &s);
@@ -272,7 +272,7 @@ public:
SceneObject *_destObject;
int _maxArea;
int _minArea;
- PlayerMover2() : PlayerMover() { _destObject = NULL; }
+ PlayerMover2() : PlayerMover() { _destObject = NULL; _minArea = _maxArea = 0;}
virtual void synchronize(Serializer &s);
virtual Common::String getClassName() { return "PlayerMover2"; }
@@ -415,7 +415,7 @@ public:
int _yDiff;
int _sceneRegionId;
public:
- SceneItem() : EventHandler() { _msg = "Feature"; _action = NULL; _sceneRegionId = 0; }
+ SceneItem() : EventHandler() { _msg = "Feature"; _action = NULL; _sceneRegionId = 0; _yDiff = 0; _fieldE = _field10 = 0;}
virtual void synchronize(Serializer &s);
virtual Common::String getClassName() { return "SceneItem"; }
@@ -685,6 +685,7 @@ public:
int xe = va_arg(va, int);
items.push_back(LineSlice(xs, xe));
}
+ va_end(va);
}
void add(LineSlice &slice) { items.push_back(slice); }