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

Clean up variables in overhead map player sprite draw code.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6953 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-07-23 02:56:05 +00:00
parent 1839427f0d
commit e14d92a2af
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/duke3d/src/screens.cpp
View file

@ -577,9 +577,12 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
{ {
if (ud.scrollmode && p == screenpeek) continue; if (ud.scrollmode && p == screenpeek) continue;
ox = sprite[g_player[p].ps->i].x-cposx; DukePlayer_t const * const pPlayer = g_player[p].ps;
oy = sprite[g_player[p].ps->i].y-cposy; uspritetype const * const pSprite = (uspritetype const *)&sprite[pPlayer->i];
daang = (sprite[g_player[p].ps->i].ang-cang)&2047;
ox = pSprite->x - cposx;
oy = pSprite->y - cposy;
daang = (pSprite->ang - cang) & 2047;
if (p == screenpeek) if (p == screenpeek)
{ {
ox = 0; ox = 0;
@ -591,24 +594,24 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
if (p == screenpeek || GTFLAGS(GAMETYPE_OTHERPLAYERSINMAP)) if (p == screenpeek || GTFLAGS(GAMETYPE_OTHERPLAYERSINMAP))
{ {
if (sprite[g_player[p].ps->i].xvel > 16 && g_player[p].ps->on_ground) if (pSprite->xvel > 16 && pPlayer->on_ground)
i = APLAYERTOP+((totalclock>>4)&3); i = APLAYERTOP+((totalclock>>4)&3);
else else
i = APLAYERTOP; i = APLAYERTOP;
i = VM_OnEventWithReturn(EVENT_DISPLAYOVERHEADMAPPLAYER, g_player[p].ps->i, p, i); i = VM_OnEventWithReturn(EVENT_DISPLAYOVERHEADMAPPLAYER, pPlayer->i, p, i);
if (i < 0) if (i < 0)
continue; continue;
j = klabs(g_player[p].ps->truefz-g_player[p].ps->pos.z)>>8; j = klabs(pPlayer->truefz - pPlayer->pos.z) >> 8;
j = mulscale16(czoom*(sprite[g_player[p].ps->i].yrepeat+j), yxaspect); j = mulscale16(czoom * (pSprite->yrepeat + j), yxaspect);
if (j < 22000) j = 22000; if (j < 22000) j = 22000;
else if (j >(65536<<1)) j = (65536<<1); else if (j > (65536<<1)) j = (65536<<1);
rotatesprite_win((x1<<4)+(xdim<<15), (y1<<4)+(ydim<<15), j, daang, i, sprite[g_player[p].ps->i].shade, rotatesprite_win((x1<<4)+(xdim<<15), (y1<<4)+(ydim<<15), j, daang, i, pSprite->shade,
(g_player[p].ps->cursectnum > -1) ? sector[g_player[p].ps->cursectnum].floorpal : 0, 0); (pPlayer->cursectnum > -1) ? sector[pPlayer->cursectnum].floorpal : 0, 0);
} }
} }
} }