Skip to content

Conversation

@SpeedyFolf
Copy link
Contributor

@SpeedyFolf SpeedyFolf commented Oct 15, 2024

  • Swapped the order of Hotring Racer 2 (ID: 502, model: hotrina) and Hotring Racer 3 (ID: 503, model: hotrinb) in /mods/deathmatch/logic/CVehicleNames.cpp
  • Fixed the "Sadler Damaged" discrepancy between the Server and Client lists which caused "Sadler Damaged" to simply be named "Sadler" in map editor.

Currently when something (such as map editor, race vehiclechange pickup labels, and admin panel) use the function getVehicleNameFromModel, they're reversed from what you'd expect based on their ID, model name, and the vehicles list wiki page. This fixes that.

Before you go ahead and create a pull request, please make sure:

If your work is incomplete, do not prefix your pull request with "WIP", instead
create a draft pull request: https://github.blog/2019-02-14-introducing-draft-pull-requests/

Thank you!

@SpeedyFolf
Copy link
Contributor Author

Not sure if it's intentionally been kept wrong.

Also not sure if the discrepancy between the 2 lists on line 206 is intentional or not. {"Sadler Damaged", "Sadler"}, in Server vs. {"Sadler", "Sadler Damaged"}, in Client.

@TheNormalnij TheNormalnij added the backwards-incompatible Should be merged after the release of 1.7.1 label Oct 25, 2024
@SpeedyFolf
Copy link
Contributor Author

Also not sure if the discrepancy between the 2 lists on line 206 is intentional or not. {"Sadler Damaged", "Sadler"}, in Server vs. {"Sadler", "Sadler Damaged"}, in Client.

This part surely isn't intentional. I noticed some vehicles are missing from map editor and upon adding them I noticed 605 is simply named "Sadler" instead of "Sadler Damaged".

Also fixed the Sadler Damaged discrepancy between the Server and Client lists
@Fernando-A-Rocha
Copy link
Contributor

Good job. Thank you!

@botder botder merged commit 45bb3d5 into multitheftauto:master Jul 31, 2025
6 checks passed
@botder botder added this to the 1.7.1 milestone Jul 31, 2025
MTABot pushed a commit that referenced this pull request Jul 31, 2025
45bb3d5 Swapped the order of Hotring Racer 2 and Hotring Racer 3 (PR #3797)
@SpeedyFolf SpeedyFolf deleted the SwapHotringRacerVehicleNames branch August 3, 2025 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backwards-incompatible Should be merged after the release of 1.7.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants