Skip to content

Commit 1f2d080

Browse files
committed
Fix getVehicleName returning false for trailers
1 parent 1bae73a commit 1f2d080

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

Client/mods/deathmatch/logic/CVehicleNames.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,7 @@ static const SFixedArray < unsigned char, 212 > ucVehicleTypes =
6969

7070
bool CVehicleNames::IsValidModel ( unsigned long ulModel )
7171
{
72-
return ( // Valid range?
73-
ulModel >= 400 && ulModel < 610 &&
74-
75-
// Exclude trailers
76-
ulModel != 435 && ulModel != 450 &&
77-
ulModel != 591 && ulModel != 606 &&
78-
ulModel != 607 && ulModel != 584 &&
79-
ulModel != 608 );
72+
return ulModel >= 400 && ulModel <= 611;
8073
}
8174

8275

Server/mods/deathmatch/logic/CVehicleNames.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,7 @@ static const SFixedArray < SVehicleName, 212 > VehicleNames =
5252

5353
bool CVehicleNames::IsValidModel ( unsigned long ulModel )
5454
{
55-
return ( // Trains
56-
ulModel >= 400 && ulModel < 610 &&
57-
/*ulModel != 449 && ulModel != 537 &&
58-
ulModel != 538 && ulModel != 569 &&
59-
ulModel != 590 &&*/
60-
61-
// Trailers
62-
ulModel != 435 && ulModel != 450 &&
63-
ulModel != 591 && ulModel != 606 &&
64-
ulModel != 607 && ulModel != 584 &&
65-
ulModel != 608 );
55+
return ulModel >= 400 && ulModel <= 611;
6656
}
6757

6858

0 commit comments

Comments
 (0)