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

- Fix: when jumping over fences or sandbags, a merc was occasionally moved inside the structure.

Browse Source 
- Fix: sandbags could only be jumped if their height was < 2. A structure with a .jsd-size of 1 barely offers protection, thus limiting the usefulness of sandbags. From now on, sandbags with a height of 2 can also be jumped. Note: This requires a changed sandbag.jsd in GameDir.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-07-24 21:20:17 +00:00
parent f4f124c7b0
commit 2ba4b77a84
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+5 -2
View File
@@ -6998,7 +6998,7 @@ BOOLEAN SOLDIERTYPE::EVENT_InternalGetNewSoldierPath( INT32 sDestGridNo, UINT16
}
else
{
this->pathing.usPathDataSize++;
++this->pathing.usPathDataSize;
}
}
@@ -9339,6 +9339,10 @@ void SOLDIERTYPE::BeginSoldierClimbFence( void )
if ( FindFenceJumpDirection( this, this->sGridNo, bDirection, &bDirection ) )
{
this->sTempNewGridNo = NewGridNo( this->sGridNo, (UINT16)DirectionInc( bDirection ) );
// Flugente: we want to jump OVER the structure, not INTO it!
this->sTempNewGridNo = NewGridNo( this->sTempNewGridNo, (UINT16)DirectionInc( bDirection ) );
this->flags.fDontChargeTurningAPs = TRUE;
EVENT_InternalSetSoldierDesiredDirection( this, bDirection, FALSE, this->usAnimState );
this->flags.fTurningUntilDone = TRUE;
@@ -9346,7 +9350,6 @@ void SOLDIERTYPE::BeginSoldierClimbFence( void )
this->flags.bTurningFromPronePosition = TURNING_FROM_PRONE_OFF;
this->usPendingAnimation = HOPFENCE;
}
}
//---legion by JAzz---------------------------------------