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

New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-01-06 03:51:09 +00:00
parent 153f55ace8
commit 9ea7ebf393
25 changed files with 462 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+15 -11
View File
@@ -1140,6 +1140,8 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 bLevel, UINT16 usHa
// if we have an empty sandbag in our hands, we also need to have a shovel in our second hand, otherwise we can't fill it
if ( HasItemFlag(usHandItem, (EMPTY_SANDBAG)) )
{
sAPCost = APBPConstants[AP_FILL_SANDBAG];
// check if we have a shovel in our second hand
OBJECTTYPE* pShovelObj = &(pSoldier->inv[SECONDHANDPOS]);
@@ -1155,10 +1157,11 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 bLevel, UINT16 usHa
return( ITEM_HANDLE_REFUSAL );
}
}
// if we have a shovel in our hands, the targetted gridno must be a fortification (debris will do for this check)
if ( HasItemFlag(usHandItem, (SHOVEL)) )
// if we have a shovel in our hands, the targeted gridno must be a fortification (debris will do for this check)
else if ( HasItemFlag(usHandItem, (SHOVEL)) )
{
sAPCost = APBPConstants[AP_REMOVE_FORTIFICATION];
STRUCTURE* pStruct = FindStructure(sGridNo, STRUCTURE_GENERIC);
if ( !pStruct )
@@ -1166,16 +1169,20 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 bLevel, UINT16 usHa
return( ITEM_HANDLE_REFUSAL );
}
}
else
{
sAPCost = APBPConstants[AP_FORTIFICATION];
}
sActionGridNo = FindAdjacentGridEx( pSoldier, sGridNo, &ubDirection, &sAdjustedGridNo, TRUE, FALSE );
if ( sActionGridNo != -1 )
{
// Calculate AP costs...
sAPCost = GetAPsToBuildFortification( pSoldier, sActionGridNo );
sAPCost += PlotPath( pSoldier, sActionGridNo, NO_COPYROUTE, FALSE, TEMPORARY, (UINT16)pSoldier->usUIMovementMode, NOT_STEALTH, FORWARD, pSoldier->bActionPoints);
if ( EnoughPoints( pSoldier, sAPCost, 0, fFromUI ) )
//if ( EnoughPoints( pSoldier, sAPCost, 0, fFromUI ) )
if ( pSoldier->bActionPoints > 0 )
{
// CHECK IF WE ARE AT THIS GRIDNO NOW
if ( pSoldier->sGridNo != sActionGridNo )
@@ -6251,9 +6258,8 @@ void SoldierStealItemFromSoldier( SOLDIERTYPE *pSoldier, SOLDIERTYPE *pOpponent,
SetCustomizableTimerCallbackAndDelay( 1000, CheckForPickedOwnership, TRUE );
}
BOOLEAN BuildFortification( UINT32 flag )
{
INT32 sGridNo;
BOOLEAN BuildFortification( INT32 sGridNo, UINT32 flag )
{
UINT32 fHeadType;
UINT16 usUseIndex;
UINT16 usUseObjIndex = 0;
@@ -6268,9 +6274,7 @@ BOOLEAN BuildFortification( UINT32 flag )
{
return FALSE;
}
GetMouseMapPos( &sGridNo );
if( InARoom( sGridNo, NULL ) )
return FALSE;