eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Hexen2 has fewer player colours for the user to select from (0-10 instead of 0-13). Don't glitch if they pick something invalid.

Browse source
This commit is contained in:
Shpoike 2023-06-25 15:59:14 +01:00
parent c55c8e96a9
commit e698f60884
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/gl/gl_alias.c
View file

@ -950,14 +950,14 @@ static shader_t *GL_ChooseSkin(galiasinfo_t *inf, model_t *model, int surfnum, e
scaled_height = 4; scaled_height = 4;
#ifdef HEXEN2 #ifdef HEXEN2
if (h2playertranslations && pc) if (h2playertranslations && pc && pc >= 1 && pc < 6)
{ {
unsigned int color_offsets[5] = {2*14*256,0,1*14*256,2*14*256,2*14*256}; unsigned int color_offsets[5] = {2*14*256,0,1*14*256,2*14*256,2*14*256};
unsigned char *colorA, *colorB, *sourceA, *sourceB; unsigned char *colorA, *colorB, *sourceA, *sourceB;
colorA = h2playertranslations + 256 + color_offsets[pc-1]; colorA = h2playertranslations + 256 + color_offsets[pc-1];
colorB = colorA + 256; colorB = colorA + 256;
sourceA = colorB + (tc * 256); sourceA = colorB + ((tc>10)?0:(tc * 256)); //hexen2 allows only colours 0..10 inclusive.
sourceB = colorB + (bc * 256); sourceB = colorB + ((bc>10)?0:(bc * 256));
for(i=0;i<256;i++) for(i=0;i<256;i++)
{ {
translate32[i] = d_8to24rgbtable[i]; translate32[i] = d_8to24rgbtable[i];