Merge pull request #439 from degasus/lighting-fix

Lighting cleanup

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Core/VideoBackends/Software/TransformUnit.cpp b/Source/Core/VideoBackends/Software/TransformUnit.cpp
index 2c4c495087..f79c57be00 100644
--- a/Source/Core/VideoBackends/Software/TransformUnit.cpp
+++ b/Source/Core/VideoBackends/Software/TransformUnit.cpp
@@ -210,7 +210,7 @@ inline float SafeDivide(float n, float d)
 
 void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, Vec3 &lightCol)
 {
-	const LightPointer *light = (const LightPointer*)&xfmem.lights[0x10*lightNum];
+	const LightPointer *light = (const LightPointer*)&xfmem.lights[lightNum];
 
 	if (!(chan.attnfunc & 1))
 	{
@@ -295,7 +295,7 @@ void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
 
 void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, float &lightCol)
 {
-	const LightPointer *light = (const LightPointer*)&xfmem.lights[0x10*lightNum];
+	const LightPointer *light = (const LightPointer*)&xfmem.lights[lightNum];
 
 	if (!(chan.attnfunc & 1))
 	{
@@ -476,7 +476,7 @@ void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool s
 			break;
 		case XF_TEXGEN_EMBOSS_MAP:
 			{
-				const LightPointer *light = (const LightPointer*)&xfmem.lights[0x10*texinfo.embosslightshift];
+				const LightPointer *light = (const LightPointer*)&xfmem.lights[texinfo.embosslightshift];
 
 				Vec3 ldir = (light->pos - dst->mvPosition).normalized();
 				float d1 = ldir * dst->normal[1];