stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert change to P_SlopeLaunch

Browse source 
Don't call slopelaunch just from object z difference if the slope has no physics.
This commit is contained in:
Sryder 2018-11-26 23:10:24 +00:00
parent 683ebec120
commit ab5dc3226b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.c
View file

@ -1938,7 +1938,9 @@ void P_XYMovement(mobj_t *mo)
FIXED_TO_FLOAT(AngleFixed(newangle)), FIXED_TO_FLOAT(AngleFixed(newangle)),
FIXED_TO_FLOAT(AngleFixed(oldangle-newangle)) FIXED_TO_FLOAT(AngleFixed(oldangle-newangle))
);*/ );*/
} else if (predictedz-mo->z > abs(slopemom.z/2)) { // Now check if we were supposed to stick to this slope // Sryder 2018-11-26: Don't launch here if it's a slope without physics, we stick to those like glue anyway
} else if (predictedz-mo->z > abs(slopemom.z/2)
&& !(mo->standingslope->flags & SL_NOPHYSICS)) { // Now check if we were supposed to stick to this slope
//CONS_Printf("%d-%d > %d\n", (predictedz), (mo->z), (slopemom.z/2)); //CONS_Printf("%d-%d > %d\n", (predictedz), (mo->z), (slopemom.z/2));
P_SlopeLaunch(mo); P_SlopeLaunch(mo);
} }

2
src/p_slopes.c
View file

@ -812,10 +812,10 @@ void P_SlopeLaunch(mobj_t *mo)
mo->momy = slopemom.y; mo->momy = slopemom.y;
mo->momz = slopemom.z; mo->momz = slopemom.z;
#endif #endif
}
//CONS_Printf("Launched off of slope.\n"); //CONS_Printf("Launched off of slope.\n");
mo->standingslope = NULL; mo->standingslope = NULL;
}
} }
// Function to help handle landing on slopes // Function to help handle landing on slopes