zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-16 17:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

add back two minor things that got lost during the merge.

Browse source
This commit is contained in:
Christoph Oelckers 2023-09-17 21:13:54 +02:00
parent beabb8005e
commit b708356f90
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/r_data/models.cpp
View file

@ -231,7 +231,7 @@ void RenderHUDModel(FModelRenderer *renderer, DPSprite *psp, FVector3 translatio
}
// Scaling model (y scale for a sprite means height, i.e. z in the world!).
objectToWorldMatrix.scale(smf->xscale, smf->zscale, smf->yscale / fovscale);
objectToWorldMatrix.scale((psp->Flags & PSPF_FLIP) ? -smf->xscale : smf->xscale, smf->zscale, smf->yscale / fovscale);
// Aplying model offsets (model offsets do not depend on model scalings).
objectToWorldMatrix.translate(smf->xoffset / smf->xscale, smf->zoffset / smf->zscale, smf->yoffset / smf->yscale);

2
src/rendering/hwrenderer/scene/hw_weapon.cpp
View file

@ -689,7 +689,7 @@ void HWDrawInfo::PreparePlayerSprites2D(sector_t * viewsector, area_t in_area, F
VMFunction * ModifyBobLayer = nullptr;
DVector2 bobxy = DVector2(weap.bobx , weap.boby);
if(weap.weapon && weap.weapon->GetCaller())
if(weap.weapon)
{
if(auto caller = weap.weapon->GetCaller())
{