Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-02 10:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(racing): put racers going the wrong way back on the track

Browse Source 
The client works out on its own when its racer goes the wrong way and
shows a 6 second countdown, but it only moves the car when the server
sends RacingSetPlayerResetInfo, which DLU never did for this.

The server now follows the reset planes the way the client's
LWORacingControlComponent does (1.10.64): each path waypoint is a plane
facing along its rotation; the racer starts between planes 0 and 1,
moves forward when in front of the upcoming plane and back when behind
the last one (CheckUpcomingResetPlane @ 0x00c7edf0, CheckLastResetPlane @
0x00c7f1a0, CrossResetPlaneBackward @ 0x00cba380). Driving back
through a second plane in a row starts the client's countdown
(UpdateWrongWayCount @ 0x00be5c10, 6 seconds); going forward through a plane ends it. When
it runs out, the racer gets the same reset as an unsmashed reset: reset
info for their furthest point and RacingResetPlayerToLastReset. Resets
sent for smashes keep the planes in step as well.

Fixes issue 764.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-27 09:04:31 -05:00
parent c759bd1a40
commit 6febb6d63c
4 changed files with 158 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
dGame/dComponents/RacingControlComponent.cpp
View File

@@ -371,6 +371,13 @@ void RacingControlComponent::OnRequestDie(Entity* player, const std::u16string&
resetInfo.respawnPos = racingPlayer.respawnPosition;
resetInfo.upcomingPlane = racingPlayer.respawnIndex + 1;
resetInfo.Send(UNASSIGNED_SYSTEM_ADDRESS);
for (auto& current : m_RacingPlayers) {
if (current.playerID != racingPlayer.playerID) continue;
current.lastPlane = resetInfo.furthestResetPlane;
current.upcomingPlane = resetInfo.upcomingPlane;
current.wrongWayCount = 0;
current.wrongWayTime = -1.0f;
}
DestroyableComponent::Resurrect(*vehicle);
auto* destroyableComponent = vehicle->GetComponent<DestroyableComponent>();
@@ -392,6 +399,10 @@ void RacingControlComponent::OnRequestDie(Entity* player, const std::u16string&
resetInfo.respawnPos = racingPlayer.respawnPosition;
resetInfo.upcomingPlane = racingPlayer.respawnIndex + 1;
resetInfo.Send(UNASSIGNED_SYSTEM_ADDRESS);
racingPlayer.lastPlane = resetInfo.furthestResetPlane;
racingPlayer.upcomingPlane = resetInfo.upcomingPlane;
racingPlayer.wrongWayCount = 0;
racingPlayer.wrongWayTime = -1.0f;
GameMessages::RacingResetPlayerToLastReset resetPlayer;
resetPlayer.target = m_Parent->GetObjectID();
@@ -804,6 +815,8 @@ void RacingControlComponent::Update(float deltaTime) {
if (m_Finished != 0) Game::entityManager->SerializeEntity(m_Parent);
if (path && player.lap < m_NumberOfLaps) UpdateWrongWay(player, *vehicle, *path, deltaTime);
// Loop through all the waypoints and see if the player has reached a
// new checkpoint
uint32_t respawnIndex = 0;
@@ -944,3 +957,70 @@ bool RacingControlComponent::MsgConfigureRacingControl(const GameMessages::Confi
}
return true;
}
void RacingControlComponent::StepResetPlanes(RacingPlayerInfo& player, const std::vector<PathWaypoint>& waypoints, const NiPoint3& position) {
// How long the client counts down (its "UpdateRaceWrongWay" timer, 6 in 1.10.64) before a wrong way racer should
// be put back
constexpr float WRONG_WAY_SECONDS = 6.0f;
constexpr float EPSILON = 1e-5f;
const auto count = static_cast<uint32_t>(waypoints.size());
if (count == 0) return;
// Which side of a reset plane the car is on: the plane goes through the waypoint, facing along its rotation
// (ClassifyPointAgainstFacingPlane @ 010e2b80 in 1.10.64). 1 = in front, 2 = behind, 3 = on it.
const auto side = [&](const uint32_t index) {
const auto& waypoint = waypoints[index];
const float distance = QuatUtils::Forward(waypoint.rotation).DotProduct(position - waypoint.position);
return distance > EPSILON ? 1 : distance < -EPSILON ? 2 : 3;
};
// Behind the last plane: driven back through it (LWORacingControlComponent::CheckLastResetPlane @ 00c7f1a0, CrossResetPlaneBackward @ 00cba380). The second plane in a row makes the
// client show its wrong way countdown (UpdateWrongWayCount @ 00be5c10).
bool wentBack = false;
for (uint32_t guard = 0; guard < count && player.lastPlane < count && side(player.lastPlane) == 2; guard++) {
wentBack = true;
player.wrongWayCount++;
if (player.wrongWayCount == 2) player.wrongWayTime = WRONG_WAY_SECONDS;
player.upcomingPlane = player.lastPlane;
player.lastPlane = player.lastPlane == 0 ? count - 1 : player.lastPlane - 1;
}
if (wentBack) return;
// In front of the upcoming plane: driven forward through it, which ends going the wrong way (CheckUpcomingResetPlane @ 00c7edf0)
for (uint32_t guard = 0; guard < count && player.upcomingPlane < count && side(player.upcomingPlane) == 1; guard++) {
player.wrongWayCount = 0;
player.wrongWayTime = -1.0f;
player.lastPlane = player.upcomingPlane;
player.upcomingPlane = (player.upcomingPlane + 1) % count;
}
}
void RacingControlComponent::UpdateWrongWay(RacingPlayerInfo& player, const Entity& vehicle, const Path& path, const float deltaTime) {
StepResetPlanes(player, path.pathWaypoints, vehicle.GetPosition());
if (player.wrongWayTime < 0.0f) return;
player.wrongWayTime -= deltaTime;
if (player.wrongWayTime > 0.0f) return;
// Out of time: back to the last reset point, the way a reset without a smash does it (the client moves the car,
// clears its wrong way state and hides the countdown when it gets the reset info)
GameMessages::RacingSetPlayerResetInfo resetInfo;
resetInfo.target = m_Parent->GetObjectID();
resetInfo.currentLap = static_cast<int32_t>(player.lap);
resetInfo.furthestResetPlane = player.respawnIndex;
resetInfo.playerID = player.playerID;
resetInfo.respawnPos = player.respawnPosition;
resetInfo.upcomingPlane = player.respawnIndex + 1;
resetInfo.Send(UNASSIGNED_SYSTEM_ADDRESS);
GameMessages::RacingResetPlayerToLastReset resetPlayer;
resetPlayer.target = m_Parent->GetObjectID();
resetPlayer.playerID = player.playerID;
resetPlayer.Send(UNASSIGNED_SYSTEM_ADDRESS);
player.lastPlane = resetInfo.furthestResetPlane;
player.upcomingPlane = resetInfo.upcomingPlane;
player.wrongWayCount = 0;
player.wrongWayTime = -1.0f;
}