zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-03 18:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to ZDoom r1931:

Browse source 
- Fixed: When giving completely new ammo, the backpack did not clamp the
  amount given to the ammo's max amount.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@573 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2009-10-24 06:56:15 +00:00
parent a24b6a2fdd
commit 43d72064a7
7 changed files with 68 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/r_plane.cpp
View file

@ -764,17 +764,16 @@ static int skycolplace;
// Get a column of sky when there is only one sky texture.
static const BYTE *R_GetOneSkyColumn (FTexture *fronttex, int x)
{
angle_t column = MulScale16 (frontxScale, viewangle + xtoviewangle[x]);
return fronttex->GetColumn ((((column^skyflip) >> sky1shift) + frontpos) >> FRACBITS, NULL);
angle_t column = (viewangle + xtoviewangle[x]) ^ skyflip;
return fronttex->GetColumn (MulScale32((column >> sky1shift) + frontpos, frontxScale), NULL);
}
// Get a column of sky when there are two overlapping sky textures
static const BYTE *R_GetTwoSkyColumns (FTexture *fronttex, int x)
{
DWORD ang = (viewangle + xtoviewangle[x])^skyflip;
DWORD angle1 = (((DWORD)MulScale16 (frontxScale, ang) >> sky1shift) + frontpos) >> FRACBITS;
DWORD angle2 = (((DWORD)MulScale16 (backxScale, ang) >> sky2shift) + backpos) >> FRACBITS;
DWORD ang = (viewangle + xtoviewangle[x]) ^ skyflip;
DWORD angle1 = (DWORD)MulScale32((ang >> sky1shift) + frontpos, frontxScale);
DWORD angle2 = (DWORD)MulScale32((ang >> sky2shift) + backpos, backxScale);
// Check if this column has already been built. If so, there's
// no reason to waste time building it again.
@ -825,7 +824,6 @@ static void R_DrawSky (visplane_t *pl)
dc_iscale = skyiscale >> skystretch;
clearbuf (swall+pl->minx, pl->maxx-pl->minx+1, dc_iscale<<2);
rw_offset = frontpos;
if (MirrorFlags & RF_XFLIP)
{
@ -1328,6 +1326,11 @@ void R_DrawSkyPlane (visplane_t *pl)
skyflip = l->args[2] ? 0u : ~0u;
}
}
// frontpos = FixedMul(frontpos, frontskytex->xScale/2);
if (backskytex != NULL)
{
backpos = FixedMul(backpos, backskytex->xScale);
}
bool fakefixed = false;
if (fixedcolormap)