zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 15:21:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct 'nofloorpalrange' range clamping, move one get_hud_pal() farther down.

Browse source 
The nofloorpalrange beginning and end indices are silently clamped to 1 .. 255.

git-svn-id: https://svn.eduke32.com/eduke32@2524 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-03-24 15:59:39 +00:00
parent 0122764017
commit cd3947f3f4
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/game.c
View file

@ -8480,7 +8480,7 @@ static int32_t parsedefinitions_game(scriptfile *script, int32_t preload)
if (scriptfile_getnumber(script,&e)) break; if (scriptfile_getnumber(script,&e)) break;
b = max(b, 1); b = max(b, 1);
e = min(e, MAXPALOOKUPS); e = min(e, MAXPALOOKUPS-1);
for (i=b; i<=e; i++) for (i=b; i<=e; i++)
g_noFloorPal[i] = 1; g_noFloorPal[i] = 1;

6
polymer/eduke32/source/player.c
View file

@ -2218,12 +2218,10 @@ void P_DoWeaponSpawn(DukePlayer_t *p)
void P_DisplayScuba(int32_t snum) void P_DisplayScuba(int32_t snum)
{ {
int32_t p;
p = get_hud_pal(g_player[snum].ps);
if (g_player[snum].ps->scuba_on) if (g_player[snum].ps->scuba_on)
{ {
int32_t p = get_hud_pal(g_player[snum].ps);
rotatesprite_win(43<<16,(200-tilesizy[SCUBAMASK])<<16,65536,0,SCUBAMASK,0,p,2+16); rotatesprite_win(43<<16,(200-tilesizy[SCUBAMASK])<<16,65536,0,SCUBAMASK,0,p,2+16);
rotatesprite_win((320-43)<<16,(200-tilesizy[SCUBAMASK])<<16,65536,1024,SCUBAMASK,0,p,2+4+16); rotatesprite_win((320-43)<<16,(200-tilesizy[SCUBAMASK])<<16,65536,1024,SCUBAMASK,0,p,2+4+16);
} }