zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 09:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename vec2s_t to vec2_16_t

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7694 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/polymost.cpp
This commit is contained in:
terminx 2019-06-25 11:28:09 +00:00 • committed by Christoph Oelckers
parent f8b17e98f3
commit 9d7e5d9970
7 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/build/src/polymost.cpp
View file

@ -1571,7 +1571,7 @@ static void polymost_setuptexture(FHardwareTexture *tex, const int32_t dameth, i
static void gloadtile_art_indexed(int32_t dapic, int32_t dameth, pthtyp *pth, int32_t doalloc)
{
vec2s_t const & tsizart = tilesiz[dapic];
vec2_16_t const & tsizart = tilesiz[dapic];
vec2_t siz = { tsizart.x, tsizart.y };
//POGOTODO: npoty
char npoty = 0;
@ -1612,7 +1612,7 @@ void gloadtile_art(int32_t dapic, int32_t dapal, int32_t tintpalnum, int32_t das
}
static int32_t fullbrightloadingpass = 0;
vec2s_t const & tsizart = tilesiz[dapic];
vec2_16_t const & tsizart = tilesiz[dapic];
vec2_t siz = { 0, 0 }, tsiz = { tsizart.x, tsizart.y };
int const picdim = tsiz.x*tsiz.y;
char hasalpha = 0, hasfullbright = 0;
@ -2258,7 +2258,7 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
//Load texture (globalpicnum)
setgotpic(globalpicnum);
vec2s_t const & tsizart = tilesiz[globalpicnum];
vec2_16_t const & tsizart = tilesiz[globalpicnum];
vec2_t tsiz = { tsizart.x, tsizart.y };
if (!waloff[globalpicnum])
@ -6048,7 +6048,7 @@ void polymost_drawsprite(int32_t snum)
pos.y -= (sintable[(tspr->ang) & 2047] >> 13);
}
vec2s_t const oldsiz = tilesiz[globalpicnum];
vec2_16_t const oldsiz = tilesiz[globalpicnum];
vec2_t tsiz = { oldsiz.x, oldsiz.y };
if (usehightile && h_xsize[globalpicnum])
@ -6645,8 +6645,8 @@ void polymost_dorotatespritemodel(int32_t sx, int32_t sy, int32_t z, int16_t a,
if (dastat & RS_TOPLEFT)
{
vec2s_t siz = tilesiz[picnum];
vec2s_t off = { (int16_t)((siz.x >> 1) + picanm[picnum].xofs), (int16_t)((siz.y >> 1) + picanm[picnum].yofs) };
vec2_16_t siz = tilesiz[picnum];
vec2_16_t off = { (int16_t)((siz.x >> 1) + picanm[picnum].xofs), (int16_t)((siz.y >> 1) + picanm[picnum].yofs) };
d = (float)z * (1.0f / (65536.f * 16384.f));
cosang2 = cosang = (float)sintable[(a + 512) & 2047] * d;
@ -6938,8 +6938,8 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
drawpoly_alpha = daalpha * (1.0f / 255.0f);
drawpoly_blend = dablend;
vec2s_t const siz = tilesiz[globalpicnum];
vec2s_t ofs = { 0, 0 };
vec2_16_t const siz = tilesiz[globalpicnum];
vec2_16_t ofs = { 0, 0 };
if (!(dastat & RS_TOPLEFT))
{