vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

func_tracktrain: when moving vertically exclusively, do not change the angle.

Browse source
This commit is contained in:
Marco Cawthorne 2025-02-24 19:03:37 -08:00
parent d3a18d5485
commit f4ca03ba02
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/gs-entbase/server/func_tracktrain.qc
View file

@ -170,7 +170,7 @@ func_tracktrain::func_tracktrain(void)
{
#ifdef SERVER
m_flWait = 0.0f;
m_flSpeed = 100; /* FIXME: This is all decided by the first path_track pretty much */
m_flSpeed = 100;
m_flDamage = 0.0f;
m_flHeight = 0.0f;
m_flStartSpeed = 0.0f;
@ -653,6 +653,16 @@ func_tracktrain::PathMoveForward(void)
/* the direction we're aiming for */
vecDiff = GetOrigin() - (eNode.GetOrigin() + [0, 0, m_flHeight]);
vecAngleDest = vectoangles(vecDiff);
if (autocvar(trackTrain_debug, 0) == num_for_edict(this)) {
printf("vecDiff: %v\n", vecDiff);
}
/* If we're moving vertically, do not change the current angle at all. */
if (fabs(vecDiff[0]) == 0 && fabs(vecDiff[0]) == 0) {
vecAngleDest[1] = angles[1];
}
vecAngleDiff = angleDifference(vecAngleDest, angles);
vecAngleDiff[2] = 0;
@ -719,10 +729,10 @@ func_tracktrain::PathMoveBack(void)
travelSpeed = m_flCurrentSpeed;
}
vecVelocity = (GetPointBetweenNodes(0.15f) + [0,0,m_flHeight]) - GetTrainPivotPoint(true);
vecVelocity = (GetPointBetweenNodes(0.15f) + [0.0f, 0.0f,m_flHeight]) - GetTrainPivotPoint(true);
turnTime = (vlen(vecVelocity) / travelSpeed);
vecVelocity = (eNode.GetOrigin() + [0,0,m_flHeight]) - GetOrigin();
vecVelocity = (eNode.GetOrigin() + [0.0f, 0.0f,m_flHeight]) - GetOrigin();
flTravelTime = (vlen(vecVelocity) / travelSpeed);
if (flTravelTime <= 0.0) {
@ -733,12 +743,22 @@ func_tracktrain::PathMoveBack(void)
}
ncVehicle_Log("Changing velocity from '%v' to '%v'", GetVelocity(), vecVelocity);
SetVelocity(vecVelocity * (1 / flTravelTime));
SetVelocity(vecVelocity * (1.0f / flTravelTime));
_SoundMove();
/* the direction we're aiming for */
vecDiff = (eNode.GetOrigin() + [0, 0, m_flHeight]) - GetOrigin();
vecAngleDest = vectorToAngles(vecDiff);
if (autocvar(trackTrain_debug, 0) == num_for_edict(this)) {
printf("vecDiff: %v\n", vecDiff);
}
/* If we're moving vertically, do not change the current angle at all. */
if (fabs(vecDiff[0]) == 0 && fabs(vecDiff[0]) == 0) {
vecAngleDest[1] = angles[1];
}
vecAngleDiff = angleDifference(vecAngleDest, angles);
vecAngleDiff[2] = 0;
@ -801,6 +821,14 @@ func_tracktrain::_PathArrivedForward(void)
/* get what's in front of us. */
eNode = (path_track)GetTrackNodeForward();
/* WHAT? This was after the DisabledTrain() check at somepoint. Was moved up here
for OBVIOUS reasons !*/
/* we have nothing. */
if (!eNode) {
PathClear();
return;
}
/* we have to check this _after_ moving... */
if (eNode.DisablesTrain() == true) {
/* first clear velocity, in case our trigger targets our train */
@ -809,12 +837,6 @@ func_tracktrain::_PathArrivedForward(void)
target = __NULL__; /* makes the train inaccessible */
return;
}
/* we have nothing. */
if (!eNode) {
PathClear();
return;
}
ncVehicle_Log("^1func_tracktrain::^3_PathArrivedForward^7: Going to target %S (%s)", target, eNode.classname);
SetOrigin((eNode.GetOrigin()) + [0,0,m_flHeight]);
@ -1006,6 +1028,8 @@ func_tracktrain::_AfterSpawn(void)
m_flCurrentSpeed = m_flSpeed;
}
m_flSpeed = m_flCurrentSpeed;
m_flWait = targetNode.m_flWait;
target = targetNode.target;

4
src/gs-entbase/server/func_train.qc
View file

@ -93,7 +93,7 @@ void
func_train::func_train(void)
{
m_flWait = 0.0f;
m_flSpeed = 0.0f; /* FIXME: This is all decided by the first path_corner pretty much */
m_flSpeed = 0.0f;
m_flDamage = 0.0f;
m_strMoveSnd = __NULL__;
m_strStopSnd = __NULL__;
@ -386,6 +386,8 @@ func_train::AfterSpawn(void)
m_flCurrentSpeed = m_flSpeed;
}
m_flSpeed = m_flCurrentSpeed;
/* if we're unable to be triggered by anything, begin moving */
if (HasTargetname() == false) {
PathMove();