diff options
| author | Peter Kohaut | 2016-10-09 20:26:53 +0200 |
|---|---|---|
| committer | Peter Kohaut | 2016-10-09 20:26:53 +0200 |
| commit | 8720c3a98f8d5e36c612c4806bd6d025d409fab5 (patch) | |
| tree | 6462c379e6d1acb2186b491bcfd93e2f1cd477b5 | |
| parent | f7acbcb057a2fcd455d3e163a99da9851a2e83ea (diff) | |
| download | scummvm-rg350-8720c3a98f8d5e36c612c4806bd6d025d409fab5.tar.gz scummvm-rg350-8720c3a98f8d5e36c612c4806bd6d025d409fab5.tar.bz2 scummvm-rg350-8720c3a98f8d5e36c612c4806bd6d025d409fab5.zip | |
BLADERUNNER: fixed some compilation warnings
| -rw-r--r-- | engines/bladerunner/actor_walk.h | 2 | ||||
| -rw-r--r-- | engines/bladerunner/combat.h | 4 | ||||
| -rw-r--r-- | engines/bladerunner/movement_track.h | 2 | ||||
| -rw-r--r-- | engines/bladerunner/script/ct01.cpp | 3 | ||||
| -rw-r--r-- | engines/bladerunner/set.h | 2 | ||||
| -rw-r--r-- | engines/bladerunner/waypoints.cpp | 1 |
6 files changed, 8 insertions, 6 deletions
diff --git a/engines/bladerunner/actor_walk.h b/engines/bladerunner/actor_walk.h index 6cd5850672..e0558a69be 100644 --- a/engines/bladerunner/actor_walk.h +++ b/engines/bladerunner/actor_walk.h @@ -47,7 +47,7 @@ private: Vector3 _next; int _facing; Common::Array<ActorWalk> _entries; - int _field15; +// int _field15; int _status; public: diff --git a/engines/bladerunner/combat.h b/engines/bladerunner/combat.h index f5deec575c..abb2a328ba 100644 --- a/engines/bladerunner/combat.h +++ b/engines/bladerunner/combat.h @@ -34,8 +34,8 @@ class Combat { bool _enabled; int _hitSoundId[9]; int _missSoundId[9]; - int _random1; - int _random2; +// int _random1; +// int _random2; public: int _ammoDamage[3]; diff --git a/engines/bladerunner/movement_track.h b/engines/bladerunner/movement_track.h index f5cb03ffec..450592210a 100644 --- a/engines/bladerunner/movement_track.h +++ b/engines/bladerunner/movement_track.h @@ -38,7 +38,7 @@ struct MovementTrackEntry { }; class MovementTrack { - BladeRunnerEngine *_vm; +// BladeRunnerEngine *_vm; private: int _currentIndex; diff --git a/engines/bladerunner/script/ct01.cpp b/engines/bladerunner/script/ct01.cpp index c5d633f0e5..001c70245d 100644 --- a/engines/bladerunner/script/ct01.cpp +++ b/engines/bladerunner/script/ct01.cpp @@ -103,7 +103,8 @@ bool ScriptCT01::MouseClick(int x, int y) { } bool ScriptCT01::ClickedOn3DObject(const char *objectName, bool a2) { - if ("ASIANSITTINGANDEATI" == objectName) { //bug? +// if ("ASIANSITTINGANDEATI" == objectName) { //bug? + if (Object_Query_Click("ASIANSITTINGANDEATI", objectName)) { Actor_Face_Object(0, "ASIANSITTINGANDEATI", true); Actor_Says(0, 365, 13); Actor_Says(28, 160, 13); diff --git a/engines/bladerunner/set.h b/engines/bladerunner/set.h index 8d9c97b232..4b4a4d92df 100644 --- a/engines/bladerunner/set.h +++ b/engines/bladerunner/set.h @@ -67,7 +67,7 @@ class Set { Walkbox *_walkboxes; int _walkboxStepSound[85]; int _footstepSoundOverride; - float _unknown[10]; +// float _unknown[10]; public: SetEffects *_effects; diff --git a/engines/bladerunner/waypoints.cpp b/engines/bladerunner/waypoints.cpp index 2d7fd19aaa..bd78693328 100644 --- a/engines/bladerunner/waypoints.cpp +++ b/engines/bladerunner/waypoints.cpp @@ -24,6 +24,7 @@ namespace BladeRunner { Waypoints::Waypoints(BladeRunnerEngine *vm, int count) { + _vm = vm; _count = count; _waypoints = new Waypoint[count]; } |