OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Reflect new coelckers/gzdoom#732 changes

Browse source
This commit is contained in:
Marisa the Magician 2019-07-07 16:16:16 +02:00
commit ef3ffcf537
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
zscript/biorifle.zsc
View file

@ -400,10 +400,10 @@ Class BioGel : Actor
else if ( BlockingFloor ) else if ( BlockingFloor )
{ {
// find closest 3d floor for its normal // find closest 3d floor for its normal
for ( int i=0; i<CurSector.extended.ffloors.Size(); i++ ) for ( int i=0; i<CurSector.Get3DFloorCount(); i++ )
{ {
if ( !(CurSector.extended.ffloors[i].top.ZAtPoint(pos.xy) ~== floorz) ) continue; if ( !(CurSector.Get3DFloor(i).top.ZAtPoint(pos.xy) ~== floorz) ) continue;
ff = CurSector.extended.ffloors[i]; ff = CurSector.Get3DFLoor(i);
break; break;
} }
if ( ff ) normal = -ff.top.Normal; if ( ff ) normal = -ff.top.Normal;
@ -420,10 +420,10 @@ Class BioGel : Actor
else if ( BlockingCeiling ) else if ( BlockingCeiling )
{ {
// find closest 3d floor for its normal // find closest 3d floor for its normal
for ( int i=0; i<CurSector.extended.ffloors.Size(); i++ ) for ( int i=0; i<CurSector.Get3DFloorCount(); i++ )
{ {
if ( !(CurSector.extended.ffloors[i].bottom.ZAtPoint(pos.xy) ~== ceilingz) ) continue; if ( !(CurSector.Get3DFloor(i).bottom.ZAtPoint(pos.xy) ~== ceilingz) ) continue;
ff = CurSector.extended.ffloors[i]; ff = CurSector.Get3DFloor(i);
break; break;
} }
if ( ff ) normal = -ff.bottom.Normal; if ( ff ) normal = -ff.bottom.Normal;

12
zscript/flakcannon.zsc
View file

@ -241,10 +241,10 @@ Class FlakChunk : Actor
if ( BlockingFloor ) if ( BlockingFloor )
{ {
// find closest 3d floor for its normal // find closest 3d floor for its normal
for ( int i=0; i<CurSector.extended.ffloors.Size(); i++ ) for ( int i=0; i<CurSector.Get3DFloorCount(); i++ )
{ {
if ( !(CurSector.extended.ffloors[i].top.ZAtPoint(pos.xy) ~== floorz) ) continue; if ( !(CurSector.Get3DFloor(i).top.ZAtPoint(pos.xy) ~== floorz) ) continue;
ff = CurSector.extended.ffloors[i]; ff = CurSector.Get3DFloor(i);
break; break;
} }
if ( ff ) HitNormal = -ff.top.Normal; if ( ff ) HitNormal = -ff.top.Normal;
@ -253,10 +253,10 @@ Class FlakChunk : Actor
else if ( BlockingCeiling ) else if ( BlockingCeiling )
{ {
// find closest 3d floor for its normal // find closest 3d floor for its normal
for ( int i=0; i<CurSector.extended.ffloors.Size(); i++ ) for ( int i=0; i<CurSector.Get3DFloorCount(); i++ )
{ {
if ( !(CurSector.extended.ffloors[i].bottom.ZAtPoint(pos.xy) ~== ceilingz) ) continue; if ( !(CurSector.Get3DFloor(i).bottom.ZAtPoint(pos.xy) ~== ceilingz) ) continue;
ff = CurSector.extended.ffloors[i]; ff = CurSector.Get3DFloor(i);
break; break;
} }
if ( ff ) HitNormal = -ff.bottom.Normal; if ( ff ) HitNormal = -ff.bottom.Normal;