diff options
author | Strangerke | 2013-10-27 18:49:38 +0100 |
---|---|---|
committer | Strangerke | 2013-10-27 18:50:12 +0100 |
commit | 09babc2664847412c73d87efe53e9fb5590d6628 (patch) | |
tree | a6fffefa2bd04cb3dcbe58da9c2a8eec300daf37 /engines | |
parent | eef7f9f46bfafd10aa76cd680f7eb14fdf02f42c (diff) | |
download | scummvm-rg350-09babc2664847412c73d87efe53e9fb5590d6628.tar.gz scummvm-rg350-09babc2664847412c73d87efe53e9fb5590d6628.tar.bz2 scummvm-rg350-09babc2664847412c73d87efe53e9fb5590d6628.zip |
TSAGE: Fix CID 1002419, 1002420, 1002421
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes3.cpp | 5 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes3.h | 2 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes5.cpp | 2 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes5.h | 3 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes9.cpp | 4 | ||||
-rw-r--r-- | engines/tsage/blue_force/blueforce_scenes9.h | 1 |
6 files changed, 15 insertions, 2 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp index 6ff26763a0..f343c9de96 100644 --- a/engines/tsage/blue_force/blueforce_scenes3.cpp +++ b/engines/tsage/blue_force/blueforce_scenes3.cpp @@ -977,6 +977,11 @@ Scene315::Scene315() { _doorOpened = false; _invGreenCount = _bookGreenCount = 0; _invGangCount = _bookGangCount = 0; + + _field1390 = 0; + _stripNumber = 0; + _field1398 = 0; + _currentCursor = INV_NONE; } void Scene315::synchronize(Serializer &s) { diff --git a/engines/tsage/blue_force/blueforce_scenes3.h b/engines/tsage/blue_force/blueforce_scenes3.h index ea9d5f7311..fdeabdaf5c 100644 --- a/engines/tsage/blue_force/blueforce_scenes3.h +++ b/engines/tsage/blue_force/blueforce_scenes3.h @@ -210,7 +210,7 @@ public: WestExit _westExit; SouthWestExit _swExit; Action1 _action1; - int _field1390; + int _field1390; // Useless variable int _stripNumber; int _field1398; int _invGreenCount, _bookGreenCount, _invGangCount; diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp index 0cf487daa9..1d23874533 100644 --- a/engines/tsage/blue_force/blueforce_scenes5.cpp +++ b/engines/tsage/blue_force/blueforce_scenes5.cpp @@ -1778,6 +1778,8 @@ void Scene570::IconManager::addItem(Icon *item) { Scene570::Icon::Icon(): NamedObject() { _iconId = _folderId = 0; + _parentFolderId = 0; + _mode = 0; } void Scene570::Icon::synchronize(Serializer &s) { diff --git a/engines/tsage/blue_force/blueforce_scenes5.h b/engines/tsage/blue_force/blueforce_scenes5.h index 56bf20c93b..ab78d02e11 100644 --- a/engines/tsage/blue_force/blueforce_scenes5.h +++ b/engines/tsage/blue_force/blueforce_scenes5.h @@ -257,7 +257,8 @@ class Scene570: public SceneExt { class Icon: public NamedObject { public: SceneText _sceneText; - int _iconId, _folderId, _parentFolderId, _mode; + int _iconId, _folderId, _parentFolderId; + int _mode; // Useless variable Common::String _text; Icon(); diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index 1c6ca57c61..aa407282e2 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -1422,6 +1422,10 @@ void Scene910::Object13::setupBreaker(int x, int y, int mode, int8 frameNumber) BF_GLOBALS._sceneItems.push_front(this); } +Scene910::Object25::Object25() { + _field90 = _field92 = 0; +} + void Scene910::Object25::synchronize(Serializer &s) { NamedObject::synchronize(s); s.syncAsSint16LE(_field90); diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h index 74708b94de..8bf7f343a1 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.h +++ b/engines/tsage/blue_force/blueforce_scenes9.h @@ -188,6 +188,7 @@ class Scene910: public PalettedScene { class Object25: public NamedObject { int _field90, _field92; public: + Object25(); void setupHiddenSwitch(int x, int y, int arg8, int argA); virtual void synchronize(Serializer &s); virtual bool startAction(CursorType action, Event &event); |