[Scummvm-git-logs] scummvm master -> 6ab1edf5974faf79b8172b4e3166c24b044abf4b

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6ab1edf597 BLADERUNNER: Fix compilation on older gcc


Commit: 6ab1edf5974faf79b8172b4e3166c24b044abf4b
    https://github.com/scummvm/scummvm/commit/6ab1edf5974faf79b8172b4e3166c24b044abf4b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-15T13:47:06+02:00

Commit Message:
BLADERUNNER: Fix compilation on older gcc

Changed paths:
    engines/bladerunner/lights.h
    engines/bladerunner/slice_renderer.cpp
    engines/bladerunner/slice_renderer.h



diff --git a/engines/bladerunner/lights.h b/engines/bladerunner/lights.h
index ed8edb5..a6f2a72 100644
--- a/engines/bladerunner/lights.h
+++ b/engines/bladerunner/lights.h
@@ -35,13 +35,13 @@ class Lights {
 #if _DEBUG
 	friend class BladeRunnerEngine;
 #endif
-	friend class SliceRenderer;
+	friend class SliceRendererLights;
 
 	BladeRunnerEngine *_vm;
 
-	Color                 _ambientLightColor;
-	Common::Array<Light*> _lights;
-	int                   _frame;
+	Color                  _ambientLightColor;
+	Common::Array<Light *> _lights;
+	int                    _frame;
 	//char gap[28];
 
 public:
diff --git a/engines/bladerunner/slice_renderer.cpp b/engines/bladerunner/slice_renderer.cpp
index f8d9a48..8e299f7 100644
--- a/engines/bladerunner/slice_renderer.cpp
+++ b/engines/bladerunner/slice_renderer.cpp
@@ -429,12 +429,12 @@ void SliceRenderer::drawInWorld(int animationId, int animationFrame, Vector3 pos
 void SliceRenderer::drawOnScreen(int animationId, int animationFrame, int screenX, int screenY, float facing, float scale, Graphics::Surface &surface, uint16 *zbuffer) {
 	if (scale == 0.0f) {
 		return;
-	}	
+	}
 	_position.x = 0;
 	_position.y = 0;
 	_position.z = 0;
 	_facing = facing;
-	
+
 	loadFrame(animationId, animationFrame);
 
 	float frameHeight = _frameSliceHeight * _frameSliceCount;
@@ -561,7 +561,7 @@ void SliceRenderer::disableShadows(int animationsIdsList[], int listSize) {
 	}
 }
 
-SliceRenderer::SliceRendererLights::SliceRendererLights(Lights *lights) {
+SliceRendererLights::SliceRendererLights(Lights *lights) {
 	_finalColor.r = 0.0f;
 	_finalColor.g = 0.0f;
 	_finalColor.b = 0.0f;
@@ -575,7 +575,7 @@ SliceRenderer::SliceRendererLights::SliceRendererLights(Lights *lights) {
 	}
 }
 
-void SliceRenderer::SliceRendererLights::calculateColorBase(Vector3 position1, Vector3 position2, float height) {
+void SliceRendererLights::calculateColorBase(Vector3 position1, Vector3 position2, float height) {
 	_finalColor.r = 0.0f;
 	_finalColor.g = 0.0f;
 	_finalColor.b = 0.0f;
@@ -610,7 +610,7 @@ void SliceRenderer::SliceRendererLights::calculateColorBase(Vector3 position1, V
 	}
 }
 
-void SliceRenderer::SliceRendererLights::calculateColorSlice(Vector3 position) {
+void SliceRendererLights::calculateColorSlice(Vector3 position) {
 	_finalColor.r = 0.0f;
 	_finalColor.g = 0.0f;
 	_finalColor.b = 0.0f;
diff --git a/engines/bladerunner/slice_renderer.h b/engines/bladerunner/slice_renderer.h
index d1659ec..c763b1e 100644
--- a/engines/bladerunner/slice_renderer.h
+++ b/engines/bladerunner/slice_renderer.h
@@ -111,23 +111,23 @@ private:
 
 	void calculateBoundingRect();
 	void loadFrame(int animation, int frame);
+};
 
-	class SliceRendererLights {
-		Lights *_lights;
-		Color   _colors[20];
-		float   _hmm[20];
-		float   _hmm2[20];
-		int     _hmm3;
+class SliceRendererLights {
+	Lights *_lights;
+	Color   _colors[20];
+	float   _hmm[20];
+	float   _hmm2[20];
+	int     _hmm3;
 
-	public:
-		Color   _finalColor;
+public:
+	Color   _finalColor;
 
-	public:
-		SliceRendererLights(Lights *lights);
+public:
+	SliceRendererLights(Lights *lights);
 
-		void calculateColorBase(Vector3 position1, Vector3 position2, float height);
-		void calculateColorSlice(Vector3 position);
-	};
+	void calculateColorBase(Vector3 position1, Vector3 position2, float height);
+	void calculateColorSlice(Vector3 position);
 };
 
 } // End of namespace BladeRunner