1 files changed, 45 insertions, 45 deletions

diff --git a/engines/bladerunner/light.h b/engines/bladerunner/light.h
index 7b05378be2..8ad86368ea 100644
--- a/engines/bladerunner/light.h
+++ b/engines/bladerunner/light.h
@@ -37,84 +37,84 @@ namespace BladeRunner {
 class Lights;
 
 class Light {
-#if _DEBUG
+#if BLADERUNNER_DEBUG_RENDERING
 	friend class BladeRunnerEngine;
 #endif
 	friend class Lights;
 	friend class SliceRenderer;
 
 protected:
-	char _name[20];
-	int _framesCount;
-	int _animated;
-	int _animatedParameters;
+	char      _name[20];
+	int       _frameCount;
+	int       _animated;
+	int       _animatedParameters;
 	Matrix4x3 _matrix;
-	Color _color;
-	float _falloffStart;
-	float _falloffEnd;
-	float _angleStart;
-	float _angleEnd;
-	float *_animationData;
-	float *_m11ptr;
-	float *_m12ptr;
-	float *_m13ptr;
-	float *_m14ptr;
-	float *_m21ptr;
-	float *_m22ptr;
-	float *_m23ptr;
-	float *_m24ptr;
-	float *_m31ptr;
-	float *_m32ptr;
-	float *_m33ptr;
-	float *_m34ptr;
-	float *_colorRPtr;
-	float *_colorGPtr;
-	float *_colorBPtr;
-	float *_falloffStartPtr;
-	float *_falloffEndPtr;
-	float *_angleStartPtr;
-	float *_angleEndPtr;
-//	Light *_next;
+	Color     _color;
+	float     _falloffStart;
+	float     _falloffEnd;
+	float     _angleStart;
+	float     _angleEnd;
+	float    *_animationData;
+	float    *_m11ptr;
+	float    *_m12ptr;
+	float    *_m13ptr;
+	float    *_m14ptr;
+	float    *_m21ptr;
+	float    *_m22ptr;
+	float    *_m23ptr;
+	float    *_m24ptr;
+	float    *_m31ptr;
+	float    *_m32ptr;
+	float    *_m33ptr;
+	float    *_m34ptr;
+	float    *_colorRPtr;
+	float    *_colorGPtr;
+	float    *_colorBPtr;
+	float    *_falloffStartPtr;
+	float    *_falloffEndPtr;
+	float    *_angleStartPtr;
+	float    *_angleEndPtr;
 
 public:
 	Light();
 	virtual ~Light();
 
-	void read(Common::ReadStream *stream, int framesCount, int frame, int animated);
-	void readVqa(Common::ReadStream *stream, int framesCount, int frame, int animated);
+	void read(Common::ReadStream *stream, int frameCount, int frame, int animated);
+	void readVqa(Common::ReadStream *stream, int frameCount, int frame, int animated);
 
 	void setupFrame(int frame);
 
-	virtual float calculate(Vector3 start, Vector3 end);
-	virtual void calculateColor(Color *outColor, Vector3 position);
+	virtual float calculate(Vector3 start, Vector3 end) const;
+	virtual void calculateColor(Color *outColor, Vector3 position) const;
 
 protected:
-	float calculateFalloutCoefficient(Vector3 start, Vector3 end, float a3, float a4);
-	float attenuation(float min, float max, float distance);
+	float calculateFalloutCoefficient(Vector3 start, Vector3 end, float a3, float a4) const;
+	float attenuation(float min, float max, float distance) const;
 };
 
 class Light1 : public Light {
-	float calculate(Vector3 start, Vector3 end);
-	void calculateColor(Color *outColor, Vector3 position);
+	float calculate(Vector3 start, Vector3 end) const;
+	void calculateColor(Color *outColor, Vector3 position) const;
 };
 
 class Light2 : public Light {
-	float calculate(Vector3 start, Vector3 end);
-	void calculateColor(Color *outColor, Vector3 position);
+	float calculate(Vector3 start, Vector3 end) const;
+	void calculateColor(Color *outColor, Vector3 position) const;
 };
 
 class Light3 : public Light {
-	void calculateColor(Color *outColor, Vector3 position);
+	void calculateColor(Color *outColor, Vector3 position) const;
 };
 
 class Light4 : public Light {
-	void calculateColor(Color *outColor, Vector3 position);
+	void calculateColor(Color *outColor, Vector3 position) const;
 };
 
 class LightAmbient : public Light {
-	float calculate(Vector3 start, Vector3 end);
-	void calculateColor(Color *outColor, Vector3 position);
+	float calculate(Vector3 start, Vector3 end) const;
+	void calculateColor(Color *outColor, Vector3 position) const;
 };
 
 } // End of namespace BladeRunner
+
 #endif