zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- auto replacement.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 21:04:02 +01:00
parent b7a2687a7b
commit 612a9e258e
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/track.cpp
View file

@ -3176,7 +3176,7 @@ bool ActorTrackDecide(TRACK_POINTp tpoint, DSWActor* actor)
if (hitinfo.hitwall < 0)
return false;
zdiff = labs(sp->z - sector[hitinfo.wall()->nextsector].floorz) >> 8;
zdiff = labs(sp->z - hitinfo.wall()->nextSector()->floorz) >> 8;
u->jump_speed = PickJumpSpeed(actor, zdiff);
}

42
source/games/sw/src/weapon.cpp
View file

@ -12615,11 +12615,11 @@ int InitSwordAttack(PLAYERp pp)
if (hitinfo.hitwall >= 0)
{
if (hitinfo.wall()->nextsector >= 0)
if (hitinfo.wall()->twoSided())
{
if (TEST(sector[hitinfo.wall()->nextsector].ceilingstat, CEILING_STAT_PLAX))
if (TEST(hitinfo.wall()->nextSector()->ceilingstat, CEILING_STAT_PLAX))
{
if (hitinfo.pos.z < sector[hitinfo.wall()->nextsector].ceilingz)
if (hitinfo.pos.z < hitinfo.wall()->nextSector()->ceilingz)
{
return 0;
}
@ -12818,11 +12818,11 @@ int InitFistAttack(PLAYERp pp)
if (hitinfo.hitwall >= 0)
{
if (hitinfo.wall()->nextsector >= 0)
if (hitinfo.wall()->twoSided())
{
if (TEST(sector[hitinfo.wall()->nextsector].ceilingstat, CEILING_STAT_PLAX))
if (TEST(hitinfo.wall()->nextSector()->ceilingstat, CEILING_STAT_PLAX))
{
if (hitinfo.pos.z < sector[hitinfo.wall()->nextsector].ceilingz)
if (hitinfo.pos.z < hitinfo.wall()->nextSector()->ceilingz)
{
return 0;
}
@ -13530,11 +13530,11 @@ int ContinueHitscan(PLAYERp pp, short sectnum, int x, int y, int z, short ang, i
if (hitinfo.hitwall >= 0)
{
if (hitinfo.wall()->nextsector >= 0)
if (hitinfo.wall()->twoSided())
{
if (TEST(sector[hitinfo.wall()->nextsector].ceilingstat, CEILING_STAT_PLAX))
if (TEST(hitinfo.wall()->nextSector()->ceilingstat, CEILING_STAT_PLAX))
{
if (hitinfo.pos.z < sector[hitinfo.wall()->nextsector].ceilingz)
if (hitinfo.pos.z < hitinfo.wall()->nextSector()->ceilingz)
{
return 0;
}
@ -13687,11 +13687,11 @@ int InitShotgun(PLAYERp pp)
if (hitinfo.hitwall >= 0)
{
if (hitinfo.wall()->nextsector >= 0)
if (hitinfo.wall()->twoSided())
{
if (TEST(sector[hitinfo.wall()->nextsector].ceilingstat, CEILING_STAT_PLAX))
if (TEST(hitinfo.wall()->nextSector()->ceilingstat, CEILING_STAT_PLAX))
{
if (hitinfo.pos.z < sector[hitinfo.wall()->nextsector].ceilingz)
if (hitinfo.pos.z < hitinfo.wall()->nextSector()->ceilingz)
{
continue;
}
@ -16250,11 +16250,11 @@ int InitUzi(PLAYERp pp)
if (hitinfo.hitwall >= 0)
{
if (hitinfo.wall()->nextsector >= 0)
if (hitinfo.wall()->twoSided())
{
if (TEST(sector[hitinfo.wall()->nextsector].ceilingstat, CEILING_STAT_PLAX))
if (TEST(hitinfo.wall()->nextSector()->ceilingstat, CEILING_STAT_PLAX))
{
if (hitinfo.pos.z < sector[hitinfo.wall()->nextsector].ceilingz)
if (hitinfo.pos.z < hitinfo.wall()->nextSector()->ceilingz)
{
return 0;
}
@ -17188,11 +17188,11 @@ int InitTurretMgun(SECTOR_OBJECTp sop)
if (hitinfo.hitwall >= 0)
{
if (hitinfo.wall()->nextsector >= 0)
if (hitinfo.wall()->twoSided())
{
if (TEST(sector[hitinfo.wall()->nextsector].ceilingstat, CEILING_STAT_PLAX))
if (TEST(hitinfo.wall()->nextSector()->ceilingstat, CEILING_STAT_PLAX))
{
if (hitinfo.pos.z < sector[hitinfo.wall()->nextsector].ceilingz)
if (hitinfo.pos.z < hitinfo.wall()->nextSector()->ceilingz)
{
return 0;
}
@ -17324,11 +17324,11 @@ int InitEnemyUzi(DSWActor* actor)
if (hitinfo.hitwall >= 0)
{
if (hitinfo.wall()->nextsector >= 0)
if (hitinfo.wall()->twoSided())
{
if (TEST(sector[hitinfo.wall()->nextsector].ceilingstat, CEILING_STAT_PLAX))
if (TEST(hitinfo.wall()->nextSector()->ceilingstat, CEILING_STAT_PLAX))
{
if (hitinfo.pos.z < sector[hitinfo.wall()->nextsector].ceilingz)
if (hitinfo.pos.z < hitinfo.wall()->nextSector()->ceilingz)
{
return 0;
}