zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge http://github.com/coelckers/gzdoom

This commit is contained in:
raa-eruanna 2016-10-12 03:15:03 -04:00
parent 3146f75ae0 a4a00435e2
commit 15c08f73d5
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gl/scene/gl_weapon.cpp
View File

@ -129,19 +129,20 @@ void FGLRenderer::DrawPSprite (player_t * player,DPSprite *psp, float sx, float
y1 = viewwindowy + vh / 2 - (ftexturemid * scale); y1 = viewwindowy + vh / 2 - (ftexturemid * scale);
y2 = y1 + (r.height * scale) + 1; y2 = y1 + (r.height * scale) + 1;
if (!mirror) if (!(mirror) != !(psp->Flags & PSPF_FLIP))
{ {
fU1=tex->GetSpriteUL(); fU2 = tex->GetSpriteUL();
fV1=tex->GetSpriteVT(); fV1 = tex->GetSpriteVT();
fU2=tex->GetSpriteUR(); fU1 = tex->GetSpriteUR();
fV2=tex->GetSpriteVB(); fV2 = tex->GetSpriteVB();
} }
else else
{ {
fU2=tex->GetSpriteUL(); fU1 = tex->GetSpriteUL();
fV1=tex->GetSpriteVT(); fV1 = tex->GetSpriteVT();
fU1=tex->GetSpriteUR(); fU2 = tex->GetSpriteUR();
fV2=tex->GetSpriteVB(); fV2 = tex->GetSpriteVB();
} }
if (tex->GetTransparent() || OverrideShader != -1) if (tex->GetTransparent() || OverrideShader != -1)

1
src/p_pspr.h
View File

@ -57,6 +57,7 @@ enum PSPFlags
PSPF_ADDBOB = 1 << 1, PSPF_ADDBOB = 1 << 1,
PSPF_POWDOUBLE = 1 << 2, PSPF_POWDOUBLE = 1 << 2,
PSPF_CVARFAST = 1 << 3, PSPF_CVARFAST = 1 << 3,
PSPF_FLIP = 1 << 6,
}; };
class DPSprite : public DObject class DPSprite : public DObject

2
src/r_things.cpp
View File

@ -1422,7 +1422,7 @@ void R_DrawPSprite(DPSprite *pspr, AActor *owner, float bobx, float boby, double
vis->pic = tex; vis->pic = tex;
vis->Style.ColormapNum = 0; vis->Style.ColormapNum = 0;
if (flip) if (!(flip) != !(pspr->Flags & PSPF_FLIP))
{ {
vis->xiscale = -FLOAT2FIXED(pspritexiscale * tex->Scale.X); vis->xiscale = -FLOAT2FIXED(pspritexiscale * tex->Scale.X);
vis->startfrac = (tex->GetWidth() << FRACBITS) - 1; vis->startfrac = (tex->GetWidth() << FRACBITS) - 1;

1
wadsrc/static/actors/constants.txt
View File

@ -598,6 +598,7 @@ enum
PSPF_ADDBOB = 1 << 1, PSPF_ADDBOB = 1 << 1,
PSPF_POWDOUBLE = 1 << 2, PSPF_POWDOUBLE = 1 << 2,
PSPF_CVARFAST = 1 << 3, PSPF_CVARFAST = 1 << 3,
PSPF_FLIP = 1 << 6,
}; };
// Default psprite layers // Default psprite layers