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

Fix for not enough action points error message not appearing when using consumable without enough AP in turn based mode. (The message got overriden with another one -> "Huh?") (by Shadooow)

Browse Source 
Additionally fixed empty canteens to consume AP just to do nothing. Empty canteen now throws the Huh? error.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8993 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-04-30 20:54:27 +00:00
parent 5400775c82
commit 891a17d859
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+3 -2
View File
@@ -9508,11 +9508,12 @@ void MAPInvClickCamoCallback( MOUSE_REGION *pRegion, INT32 iReason )
// We are doing this ourselve, continue // We are doing this ourselve, continue
if ( pSoldier->stats.bLife >= CONSCIOUSNESS ) if ( pSoldier->stats.bLife >= CONSCIOUSNESS )
{ {
if ( ApplyConsumable( pSoldier, gpItemPointer, FALSE, TRUE ) ) BOOLEAN bApplyConsumable = ApplyConsumable(pSoldier, gpItemPointer, FALSE, TRUE);
if (bApplyConsumable == TRUE)
{ {
UpdateMercBodyRegionHelpText( ); UpdateMercBodyRegionHelpText( );
} }
else else if(!bApplyConsumable)
{ {
// Send message // Send message
//Heinz: 23.02.09 BUGFIX: Don't send message when SKI is on //Heinz: 23.02.09 BUGFIX: Don't send message when SKI is on
Tactical/Soldier Control.cpp
+9 -8
View File
@@ -22738,7 +22738,7 @@ void SOLDIERTYPE::EVENT_SoldierApplyItemToPerson( INT32 sGridNo, UINT8 ubDirecti
{ {
success = AutoPlaceObject( pSoldier, pObj, FALSE ); success = AutoPlaceObject( pSoldier, pObj, FALSE );
} }
else if ( ApplyConsumable( pSoldier, pObj, TRUE, TRUE ) ) else if ( ApplyConsumable( pSoldier, pObj, TRUE, TRUE ) == TRUE)
{ {
success = TRUE; success = TRUE;
} }
@@ -25729,13 +25729,14 @@ void HandleVolunteerRecruitment( SOLDIERTYPE* pRecruiter, SOLDIERTYPE* pTarget )
} }
// Flugente: apply a consumable item on a soldier. Returns true if item was successfully interacted with // Flugente: apply a consumable item on a soldier. Returns true if item was successfully interacted with
BOOLEAN ApplyConsumable( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce, BOOLEAN fUseAPs ) // Shadooow: Now returns 2 in case that the action failed due to the not enough action points!
BOOLEAN ApplyConsumable(SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce, BOOLEAN fUseAPs)
{ {
if ( !pSoldier || !pObj ) if (!pSoldier || !pObj)
return FALSE; return FALSE;
// if it's not a kit or a misc item, we cannot consume it // if it's not a kit or a misc item, we cannot consume it
if ( !(Item[pObj->usItem].usItemClass & (IC_KIT | IC_MISC)) ) if (!(Item[pObj->usItem].usItemClass & (IC_KIT | IC_MISC)))
return FALSE; return FALSE;
BOOLEAN fSuccess = FALSE; BOOLEAN fSuccess = FALSE;
@@ -25743,12 +25744,12 @@ BOOLEAN ApplyConsumable( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce
// use portionsize, if none was entered, use full item // use portionsize, if none was entered, use full item
UINT8 portionsize = Item[pObj->usItem].usPortionSize; UINT8 portionsize = Item[pObj->usItem].usPortionSize;
if ( !portionsize ) if (!portionsize)
portionsize = 100; portionsize = 100;
// how much of this item do we use up // how much of this item do we use up
UINT16 statusused = min( portionsize, (*pObj)[0]->data.objectStatus ); UINT16 statusused = min(portionsize, (*pObj)[0]->data.objectStatus);
if ( !statusused ) if (!statusused || (statusused == 1 && Item[pObj->usItem].canteen))
return FALSE; return FALSE;
INT16 apcost = 0; INT16 apcost = 0;
@@ -25804,7 +25805,7 @@ BOOLEAN ApplyConsumable( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce
if ( !fForce && !EnoughPoints( pSoldier, apcost, 0, TRUE ) ) if ( !fForce && !EnoughPoints( pSoldier, apcost, 0, TRUE ) )
{ {
return FALSE; return 2;
} }
} }