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

Add MaxSlopeSteepness actor property

Browse source
This commit is contained in:
Nikolay Ambartsumov 2020-10-03 08:24:33 +03:00 committed by Christoph Oelckers
parent 5aeda2b139
commit a72fdd7e3e
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/playsim/actor.h
View file

@ -1157,6 +1157,7 @@ public:
double MaxDropOffHeight; double MaxDropOffHeight;
double MaxStepHeight; double MaxStepHeight;
double MaxSlopeSteepness;
int32_t Mass; int32_t Mass;
int16_t PainChance; int16_t PainChance;

8
src/playsim/p_map.cpp
View file

@ -952,7 +952,7 @@ bool PIT_CheckLine(FMultiBlockLinesIterator &mit, FMultiBlockLinesIterator::Chec
if (!(tm.thing->flags & MF_DROPOFF) && if (!(tm.thing->flags & MF_DROPOFF) &&
!(tm.thing->flags & (MF_NOGRAVITY | MF_NOCLIP))) !(tm.thing->flags & (MF_NOGRAVITY | MF_NOCLIP)))
{ {
if ((open.frontfloorplane.fC() < STEEPSLOPE) != (open.backfloorplane.fC() < STEEPSLOPE)) if ((open.frontfloorplane.fC() < tm.thing->MaxSlopeSteepness) != (open.backfloorplane.fC() < tm.thing->MaxSlopeSteepness))
{ {
// on the boundary of a steep slope // on the boundary of a steep slope
return false; return false;
@ -3255,7 +3255,7 @@ const secplane_t * P_CheckSlopeWalk(AActor *actor, DVector2 &move)
if (t < 0) if (t < 0)
{ // Desired location is behind (below) the plane { // Desired location is behind (below) the plane
// (i.e. Walking up the plane) // (i.e. Walking up the plane)
if (plane->fC() < STEEPSLOPE) if (plane->fC() < actor->MaxSlopeSteepness)
{ // Can't climb up slopes of ~45 degrees or more { // Can't climb up slopes of ~45 degrees or more
if (actor->flags & MF_NOCLIP) if (actor->flags & MF_NOCLIP)
{ {
@ -3266,12 +3266,12 @@ const secplane_t * P_CheckSlopeWalk(AActor *actor, DVector2 &move)
const msecnode_t *node; const msecnode_t *node;
bool dopush = true; bool dopush = true;
if (plane->fC() > STEEPSLOPE * 2 / 3) if (plane->fC() > actor->MaxSlopeSteepness * 2 / 3)
{ {
for (node = actor->touching_sectorlist; node; node = node->m_tnext) for (node = actor->touching_sectorlist; node; node = node->m_tnext)
{ {
sector_t *sec = node->m_sector; sector_t *sec = node->m_sector;
if (sec->floorplane.fC() >= STEEPSLOPE) if (sec->floorplane.fC() >= actor->MaxSlopeSteepness)
{ {
DVector3 pos = actor->PosRelative(sec) +move; DVector3 pos = actor->PosRelative(sec) +move;

7
src/playsim/p_mobj.cpp
View file

@ -293,6 +293,7 @@ void AActor::Serialize(FSerializer &arc)
A("meleestate", MeleeState) A("meleestate", MeleeState)
A("missilestate", MissileState) A("missilestate", MissileState)
A("maxdropoffheight", MaxDropOffHeight) A("maxdropoffheight", MaxDropOffHeight)
A("maxslopesteepness", MaxSlopeSteepness)
A("maxstepheight", MaxStepHeight) A("maxstepheight", MaxStepHeight)
A("bounceflags", BounceFlags) A("bounceflags", BounceFlags)
A("bouncefactor", bouncefactor) A("bouncefactor", bouncefactor)
@ -3909,18 +3910,18 @@ void AActor::Tick ()
// Check 3D floors as well // Check 3D floors as well
floorplane = P_FindFloorPlane(floorsector, PosAtZ(floorz)); floorplane = P_FindFloorPlane(floorsector, PosAtZ(floorz));
if (floorplane.fC() < STEEPSLOPE && if (floorplane.fC() < MaxSlopeSteepness &&
floorplane.ZatPoint (PosRelative(floorsector)) <= floorz) floorplane.ZatPoint (PosRelative(floorsector)) <= floorz)
{ {
const msecnode_t *node; const msecnode_t *node;
bool dopush = true; bool dopush = true;
if (floorplane.fC() > STEEPSLOPE*2/3) if (floorplane.fC() > MaxSlopeSteepness*2/3)
{ {
for (node = touching_sectorlist; node; node = node->m_tnext) for (node = touching_sectorlist; node; node = node->m_tnext)
{ {
const sector_t *sec = node->m_sector; const sector_t *sec = node->m_sector;
if (sec->floorplane.fC() >= STEEPSLOPE) if (sec->floorplane.fC() >= MaxSlopeSteepness)
{ {
if (floorplane.ZatPoint(PosRelative(node->m_sector)) >= Z() - MaxStepHeight) if (floorplane.ZatPoint(PosRelative(node->m_sector)) >= Z() - MaxStepHeight)
{ {

3
src/scripting/vmthunks_actors.cpp
View file

@ -1916,6 +1916,7 @@ DEFINE_FIELD(AActor, WallBounceSound)
DEFINE_FIELD(AActor, CrushPainSound) DEFINE_FIELD(AActor, CrushPainSound)
DEFINE_FIELD(AActor, MaxDropOffHeight) DEFINE_FIELD(AActor, MaxDropOffHeight)
DEFINE_FIELD(AActor, MaxStepHeight) DEFINE_FIELD(AActor, MaxStepHeight)
DEFINE_FIELD(AActor, MaxSlopeSteepness)
DEFINE_FIELD(AActor, PainChance) DEFINE_FIELD(AActor, PainChance)
DEFINE_FIELD(AActor, PainType) DEFINE_FIELD(AActor, PainType)
DEFINE_FIELD(AActor, DeathType) DEFINE_FIELD(AActor, DeathType)
@ -2002,5 +2003,3 @@ DEFINE_FIELD_X(FLineTraceData, FLineTraceData, LineSide);
DEFINE_FIELD_X(FLineTraceData, FLineTraceData, LinePart); DEFINE_FIELD_X(FLineTraceData, FLineTraceData, LinePart);
DEFINE_FIELD_X(FLineTraceData, FLineTraceData, SectorPlane); DEFINE_FIELD_X(FLineTraceData, FLineTraceData, SectorPlane);
DEFINE_FIELD_X(FLineTraceData, FLineTraceData, HitType); DEFINE_FIELD_X(FLineTraceData, FLineTraceData, HitType);

4
wadsrc/static/zscript/actors/actor.zs
View file

@ -73,6 +73,7 @@ class Actor : Thinker native
const DEFAULT_HEALTH = 1000; const DEFAULT_HEALTH = 1000;
const ONFLOORZ = -2147483648.0; const ONFLOORZ = -2147483648.0;
const ONCEILINGZ = 2147483647.0; const ONCEILINGZ = 2147483647.0;
const STEEPSLOPE = (46342./65536.); // [RH] Minimum floorplane.c value for walking
const FLOATRANDZ = ONCEILINGZ-1; const FLOATRANDZ = ONCEILINGZ-1;
const TELEFRAG_DAMAGE = 1000000; const TELEFRAG_DAMAGE = 1000000;
const MinVel = 1./65536; const MinVel = 1./65536;
@ -217,6 +218,7 @@ class Actor : Thinker native
native sound CrushPainSound; native sound CrushPainSound;
native double MaxDropoffHeight; native double MaxDropoffHeight;
native double MaxStepHeight; native double MaxStepHeight;
native double MaxSlopeSteepness;
native int16 PainChance; native int16 PainChance;
native name PainType; native name PainType;
native name DeathType; native name DeathType;
@ -313,6 +315,7 @@ class Actor : Thinker native
property MinMissileChance: MinMissileChance; property MinMissileChance: MinMissileChance;
property MaxStepHeight: MaxStepHeight; property MaxStepHeight: MaxStepHeight;
property MaxDropoffHeight: MaxDropoffHeight; property MaxDropoffHeight: MaxDropoffHeight;
property MaxSlopeSteepness: MaxSlopeSteepness;
property PoisonDamageType: PoisonDamageType; property PoisonDamageType: PoisonDamageType;
property RadiusDamageFactor: RadiusDamageFactor; property RadiusDamageFactor: RadiusDamageFactor;
property SelfDamageFactor: SelfDamageFactor; property SelfDamageFactor: SelfDamageFactor;
@ -371,6 +374,7 @@ class Actor : Thinker native
MeleeRange 64 - 20; MeleeRange 64 - 20;
MaxDropoffHeight 24; MaxDropoffHeight 24;
MaxStepHeight 24; MaxStepHeight 24;
MaxSlopeSteepness STEEPSLOPE;
BounceFactor 0.7; BounceFactor 0.7;
WallBounceFactor 0.75; WallBounceFactor 0.75;
BounceCount -1; BounceCount -1;