X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Fdispense.c;h=8ec7c2e9c81af6576666aba3aa3b0ae8ce963ad0;hb=7b8c4e61950317e2f56093328b8c42c2a3c1e2e2;hp=b05c81c714415e6f9921348fe547892667a6088c;hpb=00f47de18c9b8462fc21ad16d89f257c96d2e6be;p=tpg%2Fopendispense2.git

diff --git a/src/server/dispense.c b/src/server/dispense.c
index b05c81c..8ec7c2e 100644
--- a/src/server/dispense.c
+++ b/src/server/dispense.c
@@ -203,9 +203,9 @@ int DispenseAdd(int ActualUser, int User, int Ammount, const char *ReasonGiven)
 	char	*dstName, *byName;
 	
 #if DISPENSE_ADD_BELOW_MIN
-	ret = _Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Ammount, ReasonGiven );
+	ret = _Transfer( Bank_GetAcctByName(COKEBANK_ADDSRC_ACCT,1), User, Ammount, ReasonGiven );
 #else
-	ret = Bank_Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Ammount, ReasonGiven );
+	ret = Bank_Transfer( Bank_GetAcctByName(COKEBANK_ADDSRC_ACCT,1), User, Ammount, ReasonGiven );
 #endif
 	if(ret)	return 2;
 	
@@ -222,7 +222,7 @@ int DispenseAdd(int ActualUser, int User, int Ammount, const char *ReasonGiven)
 	return 0;
 }
 
-int DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven)
+int DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven, int *OrigBalance)
 {
 	 int	curBal = Bank_GetBalance(User);
 	char	*byName, *dstName;
@@ -232,10 +232,11 @@ int DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven)
 	byName = Bank_GetAcctName(ActualUser);
 	dstName = Bank_GetAcctName(User);
 	
-	Log_Info("set balance of %s to %i by %s [balance %i] - %s",
-		dstName, Balance, byName, Bank_GetBalance(User), ReasonGiven
+	Log_Info("set balance of %s to %i by %s [was %i, balance %i] - %s",
+		dstName, Balance, byName, curBal, Bank_GetBalance(User), ReasonGiven
 		);
 	
+	*OrigBalance = curBal;
 	free(byName);
 	free(dstName);
 	
@@ -334,8 +335,8 @@ int _GetMinBalance(int Account)
  */
 int _CanTransfer(int Source, int Destination, int Ammount)
 {
-	if( Bank_GetFlags(Source) & USER_FLAG_DISABLED )
-		return 0;
+//	if( Bank_GetFlags(Source) & USER_FLAG_DISABLED )
+//		return 0;
 	if( Ammount > 0 )
 	{
 		if( Bank_GetBalance(Source) - Ammount < _GetMinBalance(Source) )