BLADERUNNER: Fix warnings

scummvm · Sep 29, 2016 · a6f8a39 · a6f8a39
1 parent af70a90
commit a6f8a39
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
@@ -73,6 +73,10 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst)
 	_settings = new Settings(this);
 	_lights = new Lights(this);
 	_combat = new Combat(this);
+
+	_walkSoundId = -1;
+	_walkSoundVolume = 0;
+	_walkSoundBalance = 0;
 }
 
 BladeRunnerEngine::~BladeRunnerEngine() {

diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
@@ -120,9 +120,9 @@ class BladeRunnerEngine : public Engine {
 	bool _gameIsLoading;
 	bool _sceneIsLoading;
 
-	int _walkSoundId = -1;
-	int _walkSoundVolume = 0;
-	int _walkSoundBalance = 0;
+	int _walkSoundId;
+	int _walkSoundVolume;
+	int _walkSoundBalance;
 
 private:
 	static const int kArchiveCount = 10;

diff --git a/engines/bladerunner/color.h b/engines/bladerunner/color.h
@@ -36,7 +36,7 @@ struct Color {
 	Color() {
 	}
 
-	Color(float r, float g, float b) : r(r), g(g), b(b) {
+	Color(float r_, float g_, float b_) : r(r_), g(g_), b(b_) {
 	}
 };
 

diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp
@@ -574,7 +574,7 @@ bool ScriptBase::Loop_Actor_Walk_To_XYZ(int actorId, float x, float y, float z,
 
 void ScriptBase::Async_Actor_Walk_To_Waypoint(int actorId, int waypointId, int a3, int running) {
 	//TODO
-	warning("Async_Actor_Walk_To_Waypoint(%d, %d, %d, %d)", actorId, a3, running);
+	warning("Async_Actor_Walk_To_Waypoint(%d, %d, %d, %d)", actorId, waypointId, a3, running);
 }
 
 void ScriptBase::Async_Actor_Walk_To_XYZ(int actorId, float x, float y, float z, int a5, bool running) {
@@ -1075,7 +1075,7 @@ void ScriptBase::Combat_Flee_Waypoint_Set_Data(int combatFleeWaypointId, int a2,
 
 void ScriptBase::Police_Maze_Target_Track_Add(int itemId, float startX, float startY, float startZ, float endX, float endY, float endZ, int steps, signed int data[], bool a10) {
 	//TODO
-	warning("Police_Maze_Target_Track_Add(%d, %f, %f, %f, %f, %f, %f, %d, %x, %d)", itemId,  startX,  startY,  startZ,  endX,  endY,  endZ,  steps,  data,  a10);
+	warning("Police_Maze_Target_Track_Add(%d, %f, %f, %f, %f, %f, %f, %d, %p, %d)", itemId,  startX,  startY,  startZ,  endX,  endY,  endZ,  steps,  (void *)data,  a10);
 
 }