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

Vehicle Bugfixes (by anv)

Browse Source 
- fix: problem with ctrl not swapping passengers on seats further than 6
- fix: vehicle ramming people not working properly when driving in non-diagonal directions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-06-27 06:41:55 +00:00
parent d6a3e34d1f
commit 75ddf38ece
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Turn Based Input.cpp
+1 -1
View File
@@ -6887,7 +6887,7 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
if( pSoldier->flags.uiStatusFlags & ( SOLDIER_DRIVER | SOLDIER_PASSENGER ) ) if( pSoldier->flags.uiStatusFlags & ( SOLDIER_DRIVER | SOLDIER_PASSENGER ) )
{ {
SOLDIERTYPE *pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId ); SOLDIERTYPE *pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId );
if( pVehicle != NULL && bNewPosition < gNewVehicle[pVehicle->bVehicleID].iNewSeatingCapacities ) if( pVehicle != NULL && bNewPosition < gNewVehicle[ pVehicleList[ pVehicle->bVehicleID ].ubVehicleType ].iNewSeatingCapacities )
{ {
if( SwapVehicleSeat( pVehicle, pSoldier, bNewPosition ) ) if( SwapVehicleSeat( pVehicle, pSoldier, bNewPosition ) )
{ {
TileEngine/structure.cpp
+1 -1
View File
@@ -742,7 +742,7 @@ BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUC
{ {
pExistingStructure = pExistingStructure->pNext; pExistingStructure = pExistingStructure->pNext;
// damage people when driving on them // damage people when driving on them
if( fAddingForReal && ( MercPtrs[ sSoldierID ]->flags.fPastXDest || MercPtrs[ sSoldierID ]->flags.fPastYDest ) ) if( fAddingForReal )
{ {
if( TANK( MercPtrs[ sSoldierID ] ) ) if( TANK( MercPtrs[ sSoldierID ] ) )
{ {