From 9e5b9ac50e00d69cac47b2d079b4f118949a000c Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Thu, 6 Sep 2018 13:20:55 -0400
Subject: [PATCH] Flicky colors indexing fix

---
 src/p_enemy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_enemy.c b/src/p_enemy.c
index 850d135246..8088c20a8a 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -10799,8 +10799,8 @@ void P_InternalFlickySetColor(mobj_t *actor, UINT8 extrainfo)
 	if (extrainfo == 0)
 		// until we can customize flicky colors by level header, just stick to SRB2's defaults
 		actor->color = flickycolors[P_RandomKey(2)]; //flickycolors[P_RandomKey(sizeof(flickycolors))];
-	else if (extrainfo-1 < 15) //sizeof(flickycolors))
-		actor->color = flickycolors[extrainfo-1];
+	else
+		actor->color = flickycolors[min(extrainfo-1, 14)]; // sizeof(flickycolors)-1
 }
 
 // Function: A_FlickyCenter
-- 
GitLab