zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make 'nofloorpalrange' def token affect HUD weapons.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2518 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-03-22 22:47:47 +00:00
parent 5944a9ab0f
commit b5894eb7e0
3 changed files with 52 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@ uint8_t water_pal[768],slime_pal[768],title_pal[768],dre_alms[768],ending_pal[76
uint8_t *basepaltable[BASEPALCOUNT] = { palette, water_pal, slime_pal, dre_alms, title_pal, ending_pal, NULL /*anim_pal*/ }; uint8_t *basepaltable[BASEPALCOUNT] = { palette, water_pal, slime_pal, dre_alms, title_pal, ending_pal, NULL /*anim_pal*/ };
static int8_t g_noFloorPal[MAXPALOOKUPS]; // 1 if sprite pal should not be taken over from floor pal int8_t g_noFloorPal[MAXPALOOKUPS]; // 1 if sprite pal should not be taken over from floor pal
static int32_t g_skipDefaultCons = 0; static int32_t g_skipDefaultCons = 0;
static int32_t g_skipDefaultDefs = 0; // primarily for NAM/WWII GI appeasement static int32_t g_skipDefaultDefs = 0; // primarily for NAM/WWII GI appeasement

3
polymer/eduke32/source/game.h
View file

@ -235,8 +235,9 @@ extern palette_t DefaultCrosshairColors;
extern uint32_t g_frameDelay; extern uint32_t g_frameDelay;
extern uint8_t water_pal[768],slime_pal[768],title_pal[768],dre_alms[768],ending_pal[768],*anim_pal; extern uint8_t water_pal[768],slime_pal[768],title_pal[768],dre_alms[768],ending_pal[768];
extern uint8_t *basepaltable[BASEPALCOUNT]; extern uint8_t *basepaltable[BASEPALCOUNT];
extern int8_t g_noFloorPal[MAXPALOOKUPS];
extern user_defs ud; extern user_defs ud;

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

@ -1955,6 +1955,21 @@ static void P_DisplaySpit(int32_t snum)
} }
} }
static int32_t get_hud_pal(const DukePlayer_t *p)
{
if (sprite[p->i].pal == 1)
return 1;
if (p->cursectnum >= 0)
{
int32_t dapal = sector[p->cursectnum].floorpal;
if (!g_noFloorPal[dapal])
return dapal;
}
return 0;
}
static int32_t P_DisplayFist(int32_t gs,int32_t snum) static int32_t P_DisplayFist(int32_t gs,int32_t snum)
{ {
int32_t looking_arc,fisti,fistpal; int32_t looking_arc,fisti,fistpal;
@ -1973,11 +1988,7 @@ static int32_t P_DisplayFist(int32_t gs,int32_t snum)
fistzoom = 40290; fistzoom = 40290;
fistz = 194 + (sintable[((6+fisti)<<7)&2047]>>9); fistz = 194 + (sintable[((6+fisti)<<7)&2047]>>9);
if (sprite[g_player[snum].ps->i].pal == 1) fistpal = get_hud_pal(g_player[snum].ps);
fistpal = 1;
else if (g_player[snum].ps->cursectnum >= 0)
fistpal = sector[g_player[snum].ps->cursectnum].floorpal;
else fistpal = 0;
rotatesprite( rotatesprite(
(-fisti+222+(g_player[snum].sync->avel>>4))<<16, (-fisti+222+(g_player[snum].sync->avel>>4))<<16,
@ -2080,7 +2091,7 @@ static void G_DrawWeaponTile(int32_t x, int32_t y, int32_t tilenum, int32_t shad
static int32_t P_DisplayKnee(int32_t gs,int32_t snum) static int32_t P_DisplayKnee(int32_t gs,int32_t snum)
{ {
static int8_t knee_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8}; static int8_t knee_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8};
int32_t looking_arc, pal = g_player[snum].ps->palookup; int32_t looking_arc, pal;
if (g_player[snum].ps->knee_incs > 11 || g_player[snum].ps->knee_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0; if (g_player[snum].ps->knee_incs > 11 || g_player[snum].ps->knee_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0;
@ -2088,14 +2099,9 @@ static int32_t P_DisplayKnee(int32_t gs,int32_t snum)
looking_arc -= (g_player[snum].ps->hard_landing<<3); looking_arc -= (g_player[snum].ps->hard_landing<<3);
if (sprite[g_player[snum].ps->i].pal == 1) pal = get_hud_pal(g_player[snum].ps);
pal = 1; if (pal == 0)
else if (g_player[snum].ps->cursectnum >= 0) pal = g_player[snum].ps->palookup;
{
pal = sector[g_player[snum].ps->cursectnum].floorpal;
if (pal == 0)
pal = g_player[snum].ps->palookup;
}
G_DrawTileScaled(105+(g_player[snum].sync->avel>>4)-(g_player[snum].ps->look_ang>>1)+(knee_y[g_player[snum].ps->knee_incs]>>2), G_DrawTileScaled(105+(g_player[snum].sync->avel>>4)-(g_player[snum].ps->look_ang>>1)+(knee_y[g_player[snum].ps->knee_incs]>>2),
looking_arc+280-((g_player[snum].ps->horiz-g_player[snum].ps->horizoff)>>4),KNEE,gs,4+262144,pal); looking_arc+280-((g_player[snum].ps->horiz-g_player[snum].ps->horizoff)>>4),KNEE,gs,4+262144,pal);
@ -2106,7 +2112,7 @@ static int32_t P_DisplayKnee(int32_t gs,int32_t snum)
static int32_t P_DisplayKnuckles(int32_t gs,int32_t snum) static int32_t P_DisplayKnuckles(int32_t gs,int32_t snum)
{ {
static int8_t knuckle_frames[] = {0,1,2,2,3,3,3,2,2,1,0}; static int8_t knuckle_frames[] = {0,1,2,2,3,3,3,2,2,1,0};
int32_t looking_arc, pal = 0; int32_t looking_arc, pal;
if (g_player[snum].ps->knuckle_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0; if (g_player[snum].ps->knuckle_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0;
@ -2114,10 +2120,7 @@ static int32_t P_DisplayKnuckles(int32_t gs,int32_t snum)
looking_arc -= (g_player[snum].ps->hard_landing<<3); looking_arc -= (g_player[snum].ps->hard_landing<<3);
if (sprite[g_player[snum].ps->i].pal == 1) pal = get_hud_pal(g_player[snum].ps);
pal = 1;
else if (g_player[snum].ps->cursectnum >= 0)
pal = sector[g_player[snum].ps->cursectnum].floorpal;
G_DrawTileScaled(160+(g_player[snum].sync->avel>>4)-(g_player[snum].ps->look_ang>>1), G_DrawTileScaled(160+(g_player[snum].sync->avel>>4)-(g_player[snum].ps->look_ang>>1),
looking_arc+180-((g_player[snum].ps->horiz-g_player[snum].ps->horizoff)>>4), looking_arc+180-((g_player[snum].ps->horiz-g_player[snum].ps->horizoff)>>4),
@ -2217,11 +2220,7 @@ void P_DisplayScuba(int32_t snum)
{ {
int32_t p; int32_t p;
if (sprite[g_player[snum].ps->i].pal == 1) p = get_hud_pal(g_player[snum].ps);
p = 1;
else if (g_player[snum].ps->cursectnum >= 0)
p = sector[g_player[snum].ps->cursectnum].floorpal;
else p = 0;
if (g_player[snum].ps->scuba_on) if (g_player[snum].ps->scuba_on)
{ {
@ -2240,10 +2239,7 @@ static int32_t P_DisplayTip(int32_t gs,int32_t snum)
looking_arc = klabs(g_player[snum].ps->look_ang)/9; looking_arc = klabs(g_player[snum].ps->look_ang)/9;
looking_arc -= (g_player[snum].ps->hard_landing<<3); looking_arc -= (g_player[snum].ps->hard_landing<<3);
if (sprite[g_player[snum].ps->i].pal == 1) p = get_hud_pal(g_player[snum].ps);
p = 1;
else
p = sector[g_player[snum].ps->cursectnum].floorpal;
/* if(g_player[snum].ps->access_spritenum >= 0) /* if(g_player[snum].ps->access_spritenum >= 0)
p = sprite[g_player[snum].ps->access_spritenum].pal; p = sprite[g_player[snum].ps->access_spritenum].pal;
@ -2360,15 +2356,9 @@ void P_DisplayWeapon(int32_t snum)
j = 14-p->quick_kick; j = 14-p->quick_kick;
if (j != 14 || p->last_quick_kick) if (j != 14 || p->last_quick_kick)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1; if (pal == 0)
else pal = p->palookup;
{
if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
if (pal == 0)
pal = p->palookup;
}
guniqhudid = 100; guniqhudid = 100;
if (j < 6 || j > 12) if (j < 6 || j > 12)
@ -2408,15 +2398,10 @@ void P_DisplayWeapon(int32_t snum)
{ {
if ((*kb) > 0) if ((*kb) > 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1; if (pal == 0)
else pal = p->palookup;
{
if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
if (pal == 0)
pal = p->palookup;
}
guniqhudid = cw; guniqhudid = cw;
if ((*kb) < 5 || (*kb) > 9) if ((*kb) < 5 || (*kb) > 9)
G_DrawTileScaled(weapon_xoffset+220-(p->look_ang>>1), G_DrawTileScaled(weapon_xoffset+220-(p->look_ang>>1),
@ -2436,11 +2421,7 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
weapon_xoffset += 8; weapon_xoffset += 8;
gun_pos -= 10; gun_pos -= 10;
@ -2474,11 +2455,7 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
weapon_xoffset -= sintable[(768+((*kb)<<7))&2047]>>11; weapon_xoffset -= sintable[(768+((*kb)<<7))&2047]>>11;
gun_pos += sintable[(768+((*kb)<<7))&2047]>>11; gun_pos += sintable[(768+((*kb)<<7))&2047]>>11;
@ -2504,12 +2481,7 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
weapon_xoffset -= 8; weapon_xoffset -= 8;
@ -2605,11 +2577,7 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
if (*kb > 0) if (*kb > 0)
gun_pos -= sintable[(*kb)<<7]>>12; gun_pos -= sintable[(*kb)<<7]>>12;
@ -2657,11 +2625,7 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
if ((*kb) < *aplWeaponTotalTime[PISTOL_WEAPON]+1) if ((*kb) < *aplWeaponTotalTime[PISTOL_WEAPON]+1)
{ {
@ -2731,11 +2695,8 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
guniqhudid = cw; guniqhudid = cw;
if ((*kb)) if ((*kb))
{ {
@ -2769,11 +2730,8 @@ void P_DisplayWeapon(int32_t snum)
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
static uint8_t remote_frames[] = {0,1,1,2,1,1,0,0,0,0,0}; static uint8_t remote_frames[] = {0,1,1,2,1,1,0,0,0,0,0};
if (sprite[p->i].pal == 1)
pal = 1; pal = get_hud_pal(p);
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
weapon_xoffset = -48; weapon_xoffset = -48;
guniqhudid = cw; guniqhudid = cw;
@ -2793,11 +2751,7 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
if ((*kb) < (*aplWeaponTotalTime[DEVISTATOR_WEAPON]+1) && (*kb) > 0) if ((*kb) < (*aplWeaponTotalTime[DEVISTATOR_WEAPON]+1) && (*kb) > 0)
{ {
@ -2840,11 +2794,8 @@ void P_DisplayWeapon(int32_t snum)
VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1); VM_OnEvent(EVENT_DRAWWEAPON,g_player[screenpeek].ps->i,screenpeek, -1);
if (aGameVars[g_iReturnVarID].val.lValue == 0) if (aGameVars[g_iReturnVarID].val.lValue == 0)
{ {
if (sprite[p->i].pal == 1) pal = get_hud_pal(p);
pal = 1;
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
if ((*kb) < (aplWeaponTotalTime[p->curr_weapon][snum]+1) && (*kb) > 0) if ((*kb) < (aplWeaponTotalTime[p->curr_weapon][snum]+1) && (*kb) > 0)
{ {
static uint8_t cat_frames[] = { 0,0,1,1,2,2 }; static uint8_t cat_frames[] = { 0,0,1,1,2,2 };
@ -2879,11 +2830,9 @@ void P_DisplayWeapon(int32_t snum)
{ {
weapon_xoffset += 28; weapon_xoffset += 28;
looking_arc += 18; looking_arc += 18;
if (sprite[p->i].pal == 1)
pal = 1; pal = get_hud_pal(p);
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
{ {
if ((*kb) < aplWeaponTotalTime[p->curr_weapon][snum] && (*kb) > 0) if ((*kb) < aplWeaponTotalTime[p->curr_weapon][snum] && (*kb) > 0)
{ {
@ -2929,11 +2878,9 @@ void P_DisplayWeapon(int32_t snum)
{ {
weapon_xoffset += 28; weapon_xoffset += 28;
looking_arc += 18; looking_arc += 18;
if (sprite[p->i].pal == 1)
pal = 1; pal = get_hud_pal(p);
else if (p->cursectnum >= 0)
pal = sector[p->cursectnum].floorpal;
else pal = 0;
if (((*kb) > 0) && ((*kb) < aplWeaponTotalTime[p->curr_weapon][snum])) if (((*kb) > 0) && ((*kb) < aplWeaponTotalTime[p->curr_weapon][snum]))
{ {
if (sprite[p->i].pal != 1) if (sprite[p->i].pal != 1)