zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 17:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

G_DrawTileScaled: Shift the draw offsets left by 16 before applying weapon scaling

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6028 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-01-23 11:20:20 +00:00
parent 906d060c23
commit 507aff0ec0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1702,18 +1702,18 @@ static void G_DrawTileScaled(int drawX, int drawY, int tileNum, int drawShade, i
int32_t wy[2] = { windowxy1.y, windowxy2.y }; int32_t wy[2] = { windowxy1.y, windowxy2.y };
int drawYOffset = 0; int drawYOffset = 0;
int drawXOffset = 192; int drawXOffset = 192<<16;
switch (hudweap.cur) switch (hudweap.cur)
{ {
case DEVISTATOR_WEAPON: case DEVISTATOR_WEAPON:
case TRIPBOMB_WEAPON: case TRIPBOMB_WEAPON:
drawXOffset = 160; drawXOffset = 160<<16;
break; break;
default: default:
if (drawBits & DRAWEAP_CENTER) if (drawBits & DRAWEAP_CENTER)
{ {
drawXOffset = 160; drawXOffset = 160<<16;
drawBits &= ~DRAWEAP_CENTER; drawBits &= ~DRAWEAP_CENTER;
} }
break; break;
@ -1746,10 +1746,10 @@ static void G_DrawTileScaled(int drawX, int drawY, int tileNum, int drawShade, i
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (getrendermode() >= REND_POLYMOST && usemodels && md_tilehasmodel(tileNum,drawPal) >= 0) if (getrendermode() >= REND_POLYMOST && usemodels && md_tilehasmodel(tileNum,drawPal) >= 0)
drawY += (224-weapsc(224)); drawYOffset += (224<<16)-weapsc(224<<16);
#endif #endif
rotatesprite(weapsc(drawX<<16) + ((drawXOffset-weapsc(drawXOffset))<<16), rotatesprite(weapsc(drawX<<16) + (drawXOffset-weapsc(drawXOffset)),
weapsc((drawY<<16) + g_dts_yadd) + ((200-weapsc(200))<<16) + drawYOffset, weapsc((drawY<<16) + g_dts_yadd) + ((200<<16)-weapsc(200<<16)) + drawYOffset,
weapsc(65536L),drawAng,tileNum,drawShade,drawPal,(2|drawBits), weapsc(65536L),drawAng,tileNum,drawShade,drawPal,(2|drawBits),
wx[0],wy[0], wx[1],wy[1]); wx[0],wy[0], wx[1],wy[1]);
} }