1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

The merc profile #71 (RPC71) is now used for all combat jeeps.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8116 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-03-21 21:30:10 +00:00
parent be346d07ef
commit def585ef80
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface.cpp
+4 -1
View File
@@ -2026,7 +2026,10 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
//Legion //Legion
else if ( ARMED_VEHICLE( pSoldier ) ) 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 ) else if ( zHiddenNames[pSoldier->ubProfile].Hidden == TRUE )
{ {
Tactical/Soldier Create.cpp
+4 -2
View File
@@ -1116,11 +1116,13 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 *
*/ */
case TANK_NW: case TANK_NW:
case TANK_NE: case TANK_NE:
case COMBAT_JEEP:
ubVehicleID = TANK_CAR; ubVehicleID = TANK_CAR;
break; break;
case COMBAT_JEEP:
ubVehicleID = COMBAT_JEEP_CAR;
break;
} }
if ( pCreateStruct->fUseGivenVehicle ) if ( pCreateStruct->fUseGivenVehicle )
Tactical/Vehicles.h
+1
View File
@@ -220,6 +220,7 @@ enum{
NEW_VEHICLE159, NEW_VEHICLE159,
*/ */
NEW_VEHICLE1 = 0, NEW_VEHICLE1 = 0,
COMBAT_JEEP_CAR = 71,
NEW_VEHICLE2 = NEW_VEHICLE1 + 159, NEW_VEHICLE2 = NEW_VEHICLE1 + 159,
HUMMER = 160, HUMMER = 160,
ELDORADO_CAR = 161, ELDORADO_CAR = 161,