diff options
| author | Filippos Karapetis | 2019-05-27 14:50:26 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-05-27 14:53:44 +0300 |
| commit | f6af273fca66678bfa805184b8e6ac5ea4892291 (patch) | |
| tree | ecebfa0b26220624038b8b92fa7c6f048924b262 /engines/startrek/awaymission.cpp | |
| parent | f4e8eed13d7da5bcd87db7424358bf0d8759208f (diff) | |
| download | scummvm-rg350-f6af273fca66678bfa805184b8e6ac5ea4892291.tar.gz scummvm-rg350-f6af273fca66678bfa805184b8e6ac5ea4892291.tar.bz2 scummvm-rg350-f6af273fca66678bfa805184b8e6ac5ea4892291.zip | |
STARTREK: Fix MSVC warnings
- Disable duplicate if block
- Fix potentially uninitialized variables
- Change _activeMenu to be a regular pointer, instead of a SharedPtr - it was not
initialized correctly
- Fix struct packing in structs with pointers to complex objects
- Fix sound initialization
- Fix memory leaks (handles to files which were never deleted)
Diffstat (limited to 'engines/startrek/awaymission.cpp')
| -rw-r--r-- | engines/startrek/awaymission.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp index 9edf121083..3f33d1f25d 100644 --- a/engines/startrek/awaymission.cpp +++ b/engines/startrek/awaymission.cpp @@ -410,8 +410,8 @@ void StarTrekEngine::awayMissionUseObject(int16 clickedObject) { else if (_awayMission.activeObject == OBJECT_MCCOY && _room->actionHasCode(ACTION_USE, OBJECT_IMEDKIT, _awayMission.passiveObject, 0)) tryWalkToHotspot = true; // CHECKME: Identical to the previous check, thus never used - else if (_awayMission.activeObject == OBJECT_MCCOY && _room->actionHasCode(ACTION_USE, OBJECT_IMEDKIT, _awayMission.passiveObject, 0)) - tryWalkToHotspot = true; + //else if (_awayMission.activeObject == OBJECT_MCCOY && _room->actionHasCode(ACTION_USE, OBJECT_IMEDKIT, _awayMission.passiveObject, 0)) + // tryWalkToHotspot = true; else if (_awayMission.activeObject == OBJECT_SPOCK && _room->actionHasCode(ACTION_USE, OBJECT_ISTRICOR, _awayMission.passiveObject, 0)) tryWalkToHotspot = true; |