From e38e37d99c99714b65350a721e30964d0cfd61c9 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 13 Oct 2016 18:22:47 +0000
Subject: [PATCH] When buying soda from a machine, check inventory for cash
 first

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Handle Items.cpp | 66 +++++++++++++++++++++++++++++----------
 Tactical/Handle Items.h   |  2 +-
 2 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp
index f7780399d..1d6c21885 100644
--- a/Tactical/Handle Items.cpp	
+++ b/Tactical/Handle Items.cpp	
@@ -8935,7 +8935,7 @@ void DoInteractiveActionDefaultResult( INT32 sGridNo, UINT8 ubID, BOOLEAN aSucce
 
 		case INTERACTIVE_STRUCTURE_SODAMACHINE:
 		{
-			static UINT16 usSodaIndex = 1741;
+			static UINT16 usSodaIndex = 1740;
 
 			// we still have to determine whether a soda item exists, and whether we can pay for it
 			if ( aSuccess )
@@ -8945,32 +8945,64 @@ void DoInteractiveActionDefaultResult( INT32 sGridNo, UINT8 ubID, BOOLEAN aSucce
 				// determine soda item, only if this exists can we proceed to sell one
 				if ( HasItemFlag( usSodaIndex, SODA ) || GetFirstItemWithFlag( &usSodaIndex, SODA ) )
 				{
-					if ( LaptopSaveInfo.iCurrentBalance >= Item[usSodaIndex].usPrice )
+					if ( SpendMoney( pSoldier, Item[usSodaIndex].usPrice ) )
 					{
-						aSuccess = TRUE;
+						if ( CreateItem( usSodaIndex, 100, &gTempObject ) && AutoPlaceObjectAnywhere( pSoldier, &gTempObject, TRUE ) )
+						{
+							PlayJA2SampleFromFile( "Sounds\\soda_machine.wav", RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
+
+							ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szInteractiveActionText[6], pSoldier->GetName( ), Item[usSodaIndex].szItemName );
+
+							aSuccess = TRUE;
+						}
 					}
 				}
 			}				
 
-			if ( aSuccess )
-			{
-				if ( CreateItem( usSodaIndex, 100, &gTempObject ) && AutoPlaceObjectAnywhere( pSoldier, &gTempObject, TRUE ) )
-				{
-					AddTransactionToPlayersBook( TRANSFER_FUNDS_TO_MERC, pSoldier->ubProfile, GetWorldTotalMin( ), Item[usSodaIndex].usPrice );
-
-					PlayJA2SampleFromFile( "Sounds\\soda_machine.wav", RATE_11025, SoundVolume( MIDVOLUME, pSoldier->sGridNo ), 1, SoundDir( pSoldier->sGridNo ) );
-
-					ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szInteractiveActionText[6], pSoldier->GetName( ), Item[usSodaIndex].szItemName );
-				}
-			}
-			else
-			{
+			if ( !aSuccess )
 				ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szInteractiveActionText[7], pSoldier->GetName( ) );
-			}
 		}
 		break;
 
+		
+
 	default:
 		break;
 	}
 }
+
+// character spends money - either from inventory or the account
+BOOLEAN SpendMoney( SOLDIERTYPE *pSoldier, UINT32 aAmount )
+{
+	if ( !pSoldier )
+		return FALSE;
+
+	INT8 invsize = (INT8)pSoldier->inv.size( );
+	for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop )
+	{
+		if ( pSoldier->inv[bLoop].exists( ) == true && pSoldier->inv[bLoop].usItem == MONEY )
+		{
+			OBJECTTYPE* pObj = &(pSoldier->inv[bLoop]);
+
+			UINT32 remove = min( aAmount, (*pObj)[0]->data.money.uiMoneyAmount );
+			(*pObj)[0]->data.money.uiMoneyAmount -= remove;
+			aAmount -= remove;
+
+			if ( (*pObj)[0]->data.money.uiMoneyAmount <= 0 )
+				DeleteObj( &(pSoldier->inv[bLoop]) );
+
+			if ( aAmount <= 0 )
+				break;
+		}
+	}
+
+	// if we didn't have enough money on us, transfer
+	if ( aAmount > 0 && LaptopSaveInfo.iCurrentBalance >= aAmount )
+	{
+		AddTransactionToPlayersBook( TRANSFER_FUNDS_TO_MERC, pSoldier->ubProfile, GetWorldTotalMin( ), -aAmount );
+
+		aAmount = 0;
+	}
+
+	return (aAmount == 0);
+}
diff --git a/Tactical/Handle Items.h b/Tactical/Handle Items.h
index bb198aad8..1c2818184 100644
--- a/Tactical/Handle Items.h	
+++ b/Tactical/Handle Items.h	
@@ -299,5 +299,5 @@ extern ITEM_POOL *gpItemPool;//dnl ch26 210909
 // Flugente: interactive actions
 void DoInteractiveAction( INT32 sGridNo, SOLDIERTYPE *pSoldier );
 void DoInteractiveActionDefaultResult( INT32 sGridNo, UINT8 ubID, BOOLEAN aSuccess );
-
+BOOLEAN SpendMoney( SOLDIERTYPE *pSoldier, UINT32 aAmount );			// character spends money - either from inventory or the account
 #endif
\ No newline at end of file