stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 02:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'EOL-34' into EOL

Browse source 
# Conflicts:
#	src/p_enemy.c
This commit is contained in:
Alam Ed Arias 2018-11-27 23:22:10 -05:00
commit 7924c5c41b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_enemy.c
View file

@ -10799,8 +10799,8 @@ void P_InternalFlickySetColor(mobj_t *actor, UINT8 extrainfo)
if (extrainfo == 0) if (extrainfo == 0)
// until we can customize flicky colors by level header, just stick to SRB2's defaults // 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))]; actor->color = flickycolors[P_RandomKey(2)]; //flickycolors[P_RandomKey(sizeof(flickycolors))];
else if (extrainfo-1 < 15) //sizeof(flickycolors)) else
actor->color = flickycolors[extrainfo-1]; actor->color = flickycolors[min(extrainfo-1, 14)]; // sizeof(flickycolors)-1
} }
// Function: A_FlickyCenter // Function: A_FlickyCenter