Skip to content

Add trams where they are missed #1140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2025
Merged

Add trams where they are missed #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a426e6b
There are also trams when we check train locos
NexiusTailer Nov 10, 2025
66184e4
Add one more place to consider tram as train loco
NexiusTailer Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Server/Components/Vehicles/vehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void Vehicle::streamInForPlayer(IPlayer& player)
streamIn.Angle = rot.ToEuler().z;

// Trains should always be streamed with default rotation.
if (spawnData.modelID == 537 || spawnData.modelID == 538)
if (spawnData.modelID == 537 || spawnData.modelID == 538 || spawnData.modelID == 449)
{
streamIn.Angle = spawnData.zRotation;
}
Expand Down
4 changes: 2 additions & 2 deletions Server/Components/Vehicles/vehicles_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl
{
return nullptr;
}
if (!isStatic && (modelID == 538 || modelID == 537))
if (!isStatic && (modelID == 538 || modelID == 537 || modelID == 449))
{
return nullptr;
}
Expand Down Expand Up @@ -547,7 +547,7 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl

// Trains shouldn't be respawned.
const int model = vehicle->getModel();
if (model == 537 || model == 538 || model == 569 || model == 570)
if (model == 537 || model == 538 || model == 570 || model == 569 || model == 449)
{
continue;
}
Expand Down