diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index 63fd6b2e..e3db8afc 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -2026,7 +2026,10 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID ) //Legion else if ( ARMED_VEHICLE( pSoldier ) ) { - swprintf( NameStr, gNewVehicle[164].NewVehicleStrings ); + if ( pSoldier->bVehicleID >= 0 && pVehicleList ) + swprintf( NameStr, gNewVehicle[pVehicleList[pSoldier->bVehicleID].ubVehicleType].NewVehicleStrings ); + else + swprintf( NameStr, gNewVehicle[TANK_CAR].NewVehicleStrings ); } else if ( zHiddenNames[pSoldier->ubProfile].Hidden == TRUE ) { diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index db3b216c..52cd05ee 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -1115,12 +1115,14 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 * */ case TANK_NW: - case TANK_NE: - case COMBAT_JEEP: - + case TANK_NE: ubVehicleID = TANK_CAR; break; + case COMBAT_JEEP: + ubVehicleID = COMBAT_JEEP_CAR; + break; + } if ( pCreateStruct->fUseGivenVehicle ) diff --git a/Tactical/Vehicles.h b/Tactical/Vehicles.h index f5ceed94..571fa98e 100644 --- a/Tactical/Vehicles.h +++ b/Tactical/Vehicles.h @@ -220,6 +220,7 @@ enum{ NEW_VEHICLE159, */ NEW_VEHICLE1 = 0, + COMBAT_JEEP_CAR = 71, NEW_VEHICLE2 = NEW_VEHICLE1 + 159, HUMMER = 160, ELDORADO_CAR = 161,