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

experimental fix for charging AP for turning at the end of the movement

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9067 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-06-07 16:29:36 +00:00
parent 9473f3bd24
commit 4b8a00f6e2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+5 -3
View File
@@ -2635,6 +2635,8 @@ BOOLEAN HandleGotoNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving, BOOLE
} }
} }
//shadooow: fix for charging AP for turning at the end of the movement
pSoldier->flags.fDontChargeTurningAPs = TRUE;
// Change desired direction // Change desired direction
pSoldier->EVENT_InternalSetSoldierDestination( (UINT8) pSoldier->pathing.usPathingData[ pSoldier->pathing.usPathIndex ], fInitialMove, usAnimState ); pSoldier->EVENT_InternalSetSoldierDestination( (UINT8) pSoldier->pathing.usPathingData[ pSoldier->pathing.usPathIndex ], fInitialMove, usAnimState );
@@ -5816,7 +5818,7 @@ INT32 FindNextToAdjacentGridEx( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 *pub
// in that location, because we could be passed a gridno based on the overlap of soldier's graphic // in that location, because we could be passed a gridno based on the overlap of soldier's graphic
// fDoor determines whether special door-handling code should be used (for interacting with doors) // fDoor determines whether special door-handling code should be used (for interacting with doors)
INT32 sGridNoProne = -1; INT32 sGridNoProne = -1;
INT32 sFourGrids[4], sDistance=0; INT32 sDistance=0;
static const UINT8 sDirs[4] = { NORTH, EAST, SOUTH, WEST }; static const UINT8 sDirs[4] = { NORTH, EAST, SOUTH, WEST };
//INT32 cnt; //INT32 cnt;
INT32 sClosest = -1, sSpot, sSpot2; INT32 sClosest = -1, sSpot, sSpot2;
@@ -5908,7 +5910,7 @@ INT32 FindNextToAdjacentGridEx( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 *pub
for (INT8 cnt = 0; cnt < 4; ++cnt) for (INT8 cnt = 0; cnt < 4; ++cnt)
{ {
// MOVE OUT TWO DIRECTIONS // MOVE OUT TWO DIRECTIONS
sFourGrids[cnt] = sSpot = NewGridNo( sGridNo, DirectionInc( sDirs[ cnt ] ) ); sSpot = NewGridNo( sGridNo, DirectionInc( sDirs[ cnt ] ) );
ubTestDirection = sDirs[ cnt ]; ubTestDirection = sDirs[ cnt ];
@@ -5998,7 +6000,7 @@ INT32 FindNextToAdjacentGridEx( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 *pub
for (INT8 cnt = 0; cnt < 4; ++cnt) for (INT8 cnt = 0; cnt < 4; ++cnt)
{ {
// MOVE OUT TWO DIRECTIONS // MOVE OUT TWO DIRECTIONS
sFourGrids[cnt] = sSpot = NewGridNo(sGridNoProne, DirectionInc(sDirs[cnt])); sSpot = NewGridNo(sGridNoProne, DirectionInc(sDirs[cnt]));
ubTestDirection = sDirs[cnt]; ubTestDirection = sDirs[cnt];