zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 07:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- compile bug in gl_sprite and some optimization in gl_walls.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-03 22:13:38 +02:00
parent 252a6e9038
commit 603af1bb92
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_sprite.cpp
View file

@ -413,7 +413,7 @@ void GLSprite::PerformSpriteClipAdjustment(AActor *thing, const DVector2 &thingp
else if (thing->Sector->heightsec && !(thing->Sector->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC)) else if (thing->Sector->heightsec && !(thing->Sector->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC))
{ {
if (thing->flags2&MF2_ONMOBJ && thing->floorz == if (thing->flags2&MF2_ONMOBJ && thing->floorz ==
thing->Sector->heightsec->floorplane.ZatPoint(thingpos))) thing->Sector->heightsec->floorplane.ZatPoint(thingpos))
{ {
btm = thing->floorz; btm = thing->floorz;
top = thing->ceilingz; top = thing->ceilingz;

23
src/gl/scene/gl_walls.cpp
View file

@ -1428,15 +1428,22 @@ void GLWall::Process(seg_t *seg, sector_t * frontsector, sector_t * backsector)
topplane = frontsector->ceilingplane; topplane = frontsector->ceilingplane;
bottomplane = frontsector->floorplane; bottomplane = frontsector->floorplane;
zfloor[0] = segfront->floorplane.ZatPoint(v1); double v;
zfloor[1] = segfront->floorplane.ZatPoint(v2); v= segfront->floorplane.ZatPoint(v1);
ffh1 = FLOAT2FIXED(zfloor[0]); zfloor[0] = v;
ffh2 = FLOAT2FIXED(zfloor[1]); ffh1 = FLOAT2FIXED(v);
zceil[0] = segfront->ceilingplane.ZatPoint(v1); v = segfront->floorplane.ZatPoint(v2);
zceil[1] = segfront->ceilingplane.ZatPoint(v2); zfloor[1] = v;
fch1 = FLOAT2FIXED(zceil[0]); ffh2 = FLOAT2FIXED(v);
fch2 = FLOAT2FIXED(zceil[1]);
v = segfront->ceilingplane.ZatPoint(v1);
zceil[0] = v;
fch1 = FLOAT2FIXED(v);
v = segfront->ceilingplane.ZatPoint(v2);
zceil[1] = v;
fch2 = FLOAT2FIXED(v);
if (seg->linedef->special == Line_Horizon) if (seg->linedef->special == Line_Horizon)
{ {