From 32d9b87f663acf007a2ffb92cec9a4e5f5a6a813 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Wed, 25 Jul 2012 14:24:03 +0100
Subject: [PATCH] Correct Stickman appearance

---
 src/graphics/Renderer.cpp         | 28 +++++++++++++---------------
 src/simulation/elements/STKM.cpp  |  4 ++--
 src/simulation/elements/STKM2.cpp |  4 ++--
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index 557746858..3a03a1da4 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -1148,7 +1148,7 @@ void Renderer::render_parts()
 
 					if (colour_mode!=COLOUR_HEAT)
 					{
-						if (cplayer->elem<PT_NUM)
+						if (cplayer->elem<PT_NUM && cplayer->elem > 0)
 						{
 							colr = PIXR(elements[cplayer->elem].Colour);
 							colg = PIXG(elements[cplayer->elem].Colour);
@@ -1204,8 +1204,6 @@ void Renderer::render_parts()
 					glVertex2f(cplayer->legs[12], cplayer->legs[13]);
 					glEnd();
 #else
-					s = VIDXRES;
-
 					if (t==PT_STKM2)
 					{
 						legr = 100;
@@ -1229,23 +1227,23 @@ void Renderer::render_parts()
 					//head
 					if(t==PT_FIGH)
 					{
-						draw_line(nx, ny+2, nx+2, ny, colr, colg, colb, s);
-						draw_line(nx+2, ny, nx, ny-2, colr, colg, colb, s);
-						draw_line(nx, ny-2, nx-2, ny, colr, colg, colb, s);
-						draw_line(nx-2, ny, nx, ny+2, colr, colg, colb, s);
+						draw_line(nx, ny+2, nx+2, ny, colr, colg, colb, 255);
+						draw_line(nx+2, ny, nx, ny-2, colr, colg, colb, 255);
+						draw_line(nx, ny-2, nx-2, ny, colr, colg, colb, 255);
+						draw_line(nx-2, ny, nx, ny+2, colr, colg, colb, 255);
 					}
 					else
 					{
-						draw_line(nx-2, ny+2, nx+2, ny+2, colr, colg, colb, s);
-						draw_line(nx-2, ny-2, nx+2, ny-2, colr, colg, colb, s);
-						draw_line(nx-2, ny-2, nx-2, ny+2, colr, colg, colb, s);
-						draw_line(nx+2, ny-2, nx+2, ny+2, colr, colg, colb, s);
+						draw_line(nx-2, ny+2, nx+2, ny+2, colr, colg, colb, 255);
+						draw_line(nx-2, ny-2, nx+2, ny-2, colr, colg, colb, 255);
+						draw_line(nx-2, ny-2, nx-2, ny+2, colr, colg, colb, 255);
+						draw_line(nx+2, ny-2, nx+2, ny+2, colr, colg, colb, 255);
 					}
 					//legs
-					draw_line(nx, ny+3, cplayer->legs[0], cplayer->legs[1], legr, legg, legb, s);
-					draw_line(cplayer->legs[0], cplayer->legs[1], cplayer->legs[4], cplayer->legs[5], legr, legg, legb, s);
-					draw_line(nx, ny+3, cplayer->legs[8], cplayer->legs[9], legr, legg, legb, s);
-					draw_line(cplayer->legs[8], cplayer->legs[9], cplayer->legs[12], cplayer->legs[13], legr, legg, legb, s);
+					draw_line(nx, ny+3, cplayer->legs[0], cplayer->legs[1], legr, legg, legb, 255);
+					draw_line(cplayer->legs[0], cplayer->legs[1], cplayer->legs[4], cplayer->legs[5], legr, legg, legb, 255);
+					draw_line(nx, ny+3, cplayer->legs[8], cplayer->legs[9], legr, legg, legb, 255);
+					draw_line(cplayer->legs[8], cplayer->legs[9], cplayer->legs[12], cplayer->legs[13], legr, legg, legb, 255);
 #endif
 				}
 				if(pixel_mode & PMODE_FLAT)
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp
index 0a8560a75..829dcd37c 100644
--- a/src/simulation/elements/STKM.cpp
+++ b/src/simulation/elements/STKM.cpp
@@ -60,8 +60,8 @@ int Element_STKM::update(UPDATE_FUNC_ARGS)
 int Element_STKM::graphics(GRAPHICS_FUNC_ARGS)
 
 {	
-	/**pixel_mode = PSPEC_STICKMAN;
-	if ((int)sim->player.elem<PT_NUM)
+	*pixel_mode = PSPEC_STICKMAN;
+	/*if ((int)sim->player.elem<PT_NUM)
 	{
 		*colr = PIXR(elements[sim->player.elem].pcolors);
 		*colg = PIXG(elements[sim->player.elem].pcolors);
diff --git a/src/simulation/elements/STKM2.cpp b/src/simulation/elements/STKM2.cpp
index ca0d8cfe9..edcef1819 100644
--- a/src/simulation/elements/STKM2.cpp
+++ b/src/simulation/elements/STKM2.cpp
@@ -59,8 +59,8 @@ int Element_STKM2::update(UPDATE_FUNC_ARGS)
 int Element_STKM2::graphics(GRAPHICS_FUNC_ARGS)
 
 {	
-	/**pixel_mode = PSPEC_STICKMAN;
-	if ((int)sim->player2.elem<PT_NUM)
+	*pixel_mode = PSPEC_STICKMAN;
+	/*if ((int)sim->player2.elem<PT_NUM)
 	{
 		*colr = PIXR(elements[sim->player2.elem].pcolors);
 		*colg = PIXG(elements[sim->player2.elem].pcolors);