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

Fixes (by Shadooow):

Browse Source 
- fixed AP cost shown at the cursor when pressing ALT during RUN mode since game doesn't allow to "reverse run" and forces walking
- shows walking cursor instead of running if ALT is held

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-04-23 06:42:09 +00:00
parent df3d71f07c
commit b8aac91b9e
2 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle UI.cpp
+2 -2
View File
@@ -5188,7 +5188,7 @@ void SetMovementModeCursor( SOLDIERTYPE *pSoldier )
break; break;
case RUNNING: case RUNNING:
guiNewUICursor = MOVE_RUN_UICURSOR; guiNewUICursor = gUIUseReverse ? MOVE_WALK_UICURSOR : MOVE_RUN_UICURSOR;
break; break;
case SWATTING: case SWATTING:
@@ -5292,7 +5292,7 @@ void SetConfirmMovementModeCursor( SOLDIERTYPE *pSoldier, BOOLEAN fFromMove )
break; break;
case RUNNING: case RUNNING:
guiNewUICursor = CONFIRM_MOVE_RUN_UICURSOR; guiNewUICursor = gUIUseReverse ? CONFIRM_MOVE_WALK_UICURSOR : CONFIRM_MOVE_RUN_UICURSOR;
break; break;
case SWATTING: case SWATTING:
Tactical/PATHAI.cpp
+9 -30
View File
@@ -4518,7 +4518,6 @@ INT32 PlotPath( SOLDIERTYPE *pSold, INT32 sDestGridNo, INT8 bCopyRoute, INT8 bPl
// For now, use known hight adjustment // For now, use known hight adjustment
// sevenfm: ignore person at destination if we are estimating path cost // sevenfm: ignore person at destination if we are estimating path cost
if ( gfRecalculatingExistingPathCost || FindBestPath( pSold, sDestGridNo, pSold->pathing.bLevel, usMovementMode, bCopyRoute, gfEstimatePath ? PATH_IGNORE_PERSON_AT_DEST : 0 ) ) if ( gfRecalculatingExistingPathCost || FindBestPath( pSold, sDestGridNo, pSold->pathing.bLevel, usMovementMode, bCopyRoute, gfEstimatePath ? PATH_IGNORE_PERSON_AT_DEST : 0 ) )
//if ( gfRecalculatingExistingPathCost || FindBestPath( pSold, sDestGridNo, pSold->pathing.bLevel, usMovementMode, bCopyRoute, 0 ) )
{ {
// if soldier would be STARTING to run then he pays a penalty since it takes time to // if soldier would be STARTING to run then he pays a penalty since it takes time to
// run full speed // run full speed
@@ -4528,11 +4527,16 @@ INT32 PlotPath( SOLDIERTYPE *pSold, INT32 sDestGridNo, INT8 bCopyRoute, INT8 bPl
sPointsRun = GetAPsStartRun( pSold ); // changed by SANDRO sPointsRun = GetAPsStartRun( pSold ); // changed by SANDRO
} }
// Add to points, those needed to start from different stance! //shadooow: a little hack to calculate correct AP cost because game doesn't allow to run in reverse and forces walk mode
if (usMovementMode && (pSold->bReverse || bReverse))
{
usMovementMode = WALKING;
}
// Add to points, those needed to start from different stance!
sPoints = sPoints + MinAPsToStartMovement( pSold, usMovementMode ); sPoints = sPoints + MinAPsToStartMovement( pSold, usMovementMode );
// We should reduce points for starting to run if first tile is a fence...
// We should reduce points for starting to run if first tile is a fence...
sTestGridNo = NewGridNo(pSold->sGridNo, DirectionInc( (UINT8)guiPathingData[0])); sTestGridNo = NewGridNo(pSold->sGridNo, DirectionInc( (UINT8)guiPathingData[0]));
// WANNE: Quickfix for wrong pathing data (direction). This fixes crash that could rarly occur // WANNE: Quickfix for wrong pathing data (direction). This fixes crash that could rarly occur
@@ -4549,30 +4553,7 @@ INT32 PlotPath( SOLDIERTYPE *pSold, INT32 sDestGridNo, INT8 bCopyRoute, INT8 bPl
} }
} }
// FIRST, add up "startup" additional costs - such as intermediate animations, etc. if (bStayOn)
/* removing warning C4060 (jonathanl)
switch(pSold->usAnimState)
{
//case START_AID :
//case GIVING_AID : sAnimCost = APBPConstants[AP_STOP_FIRST_AID];
// break;
//case TWISTOMACH :
//case COLLAPSED : sAnimCost = APBPConstants[AP_GET_UP];
// break;
//case TWISTBACK :
//case UNCONSCIOUS : sAnimCost = (APBPConstants[AP_ROLL_OVER]+APBPConstants[AP_GET_UP]);
// break;
// case CROUCHING : if (usMovementMode == WALKING || usMovementMode == RUNNING)
// sAnimCost = APBPConstants[AP_CROUCH];
// break;
}
sPoints = sPoints + sAnimCost;
gusAPtsToMove = gusAPtsToMove + sAnimCost;*/
if (bStayOn)
{ {
iLastGrid = giPathDataSize+1; iLastGrid = giPathDataSize+1;
} }
@@ -4581,7 +4562,6 @@ INT32 PlotPath( SOLDIERTYPE *pSold, INT32 sDestGridNo, INT8 bCopyRoute, INT8 bPl
iLastGrid = giPathDataSize; iLastGrid = giPathDataSize;
} }
for ( iCnt=0; iCnt < iLastGrid; iCnt++ ) for ( iCnt=0; iCnt < iLastGrid; iCnt++ )
{ {
sExtraCostStand = 0; sExtraCostStand = 0;
@@ -4597,7 +4577,6 @@ INT32 PlotPath( SOLDIERTYPE *pSold, INT32 sDestGridNo, INT8 bCopyRoute, INT8 bPl
usMovementModeToUseForAPs = usMovementMode; usMovementModeToUseForAPs = usMovementMode;
// WANNE.WATER: If our soldier is not on the ground level and the tile is a "water" tile, then simply set the tile to "FLAT_GROUND" // WANNE.WATER: If our soldier is not on the ground level and the tile is a "water" tile, then simply set the tile to "FLAT_GROUND"
// This should fix "problems" for special modified maps // This should fix "problems" for special modified maps
UINT8 ubTerrainID = gpWorldLevelData[ sTempGrid ].ubTerrainID; UINT8 ubTerrainID = gpWorldLevelData[ sTempGrid ].ubTerrainID;