Give menu color to elements without one (stickmen, TRON, and WARP) The color is ignored, so they still look the same

(amended to remove "*pixel_mode &= ~PMODE;", since *pixel_mode is
set to PSPEC_STICKMAN immediately afterwards)

4 files changed, 5 insertions, 47 deletions

diff --git a/src/elements/figh.c b/src/elements/figh.c
index 2234eab..7c8c46c 100644
--- a/src/elements/figh.c
+++ b/src/elements/figh.c
@@ -103,20 +103,3 @@ int update_FIGH(UPDATE_FUNC_ARGS)
 	run_stickman(figh, UPDATE_FUNC_SUBCALL_ARGS);
 	return 0;
 }
-
-int graphics_FIGH(GRAPHICS_FUNC_ARGS)
-{	
-	playerst * cplayer = &fighters[(unsigned char)cpart->tmp];
-	*pixel_mode = PSPEC_STICKMAN;
-	if (cplayer->elem<PT_NUM)
-	{
-		*colr = PIXR(ptypes[cplayer->elem].pcolors);
-		*colg = PIXG(ptypes[cplayer->elem].pcolors);
-		*colb = PIXB(ptypes[cplayer->elem].pcolors);
-	}
-	else
-	{
-		*colr = *colg = *colb = 255;
-	}
-	return 1;
-}
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index bbb266d..d517844 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -31,19 +31,10 @@ int update_STKM(UPDATE_FUNC_ARGS)
 }
 
 int graphics_STKM(GRAPHICS_FUNC_ARGS)
-{	
+{
+	*colr = *colg = *colb = *cola = 0;
 	*pixel_mode = PSPEC_STICKMAN;
-	if ((int)player.elem<PT_NUM)
-	{
-		*colr = PIXR(ptypes[player.elem].pcolors);
-		*colg = PIXG(ptypes[player.elem].pcolors);
-		*colb = PIXB(ptypes[player.elem].pcolors);
-	}
-	else
-	{
-		*colr = *colg = *colb = 255;
-	}
-	return 1;
+	return 0;
 }
 
 int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
diff --git a/src/elements/stkm2.c b/src/elements/stkm2.c
index 61ef286..a83f0d0 100644
--- a/src/elements/stkm2.c
+++ b/src/elements/stkm2.c
@@ -25,20 +25,4 @@ int update_SPAWN2(UPDATE_FUNC_ARGS) {
 int update_STKM2(UPDATE_FUNC_ARGS) {
 	run_stickman(&player2, UPDATE_FUNC_SUBCALL_ARGS);
 	return 0;
-}
-
-int graphics_STKM2(GRAPHICS_FUNC_ARGS)
-{	
-	*pixel_mode = PSPEC_STICKMAN;
-	if ((int)player2.elem<PT_NUM)
-	{
-		*colr = PIXR(ptypes[player2.elem].pcolors);
-		*colg = PIXG(ptypes[player2.elem].pcolors);
-		*colb = PIXB(ptypes[player2.elem].pcolors);
-	}
-	else
-	{
-		*colr = *colg = *colb = 255;
-	}
-	return 1;
-}
+}
\ No newline at end of file
diff --git a/src/elements/warp.c b/src/elements/warp.c
index 05ec929..42f2d3a 100644
--- a/src/elements/warp.c
+++ b/src/elements/warp.c
@@ -53,7 +53,7 @@ int update_WARP(UPDATE_FUNC_ARGS) {
 }
 int graphics_WARP(GRAPHICS_FUNC_ARGS)
 {
-	*cola = 0;
+	*colr = *colg = *colb = *cola = 0;
 	*pixel_mode &= ~PMODE;
 	return 0;
 }