Clean up config handling a little

[tpg/opendispense2.git] / src / server / dispense.c

diff --git a/src/server/dispense.c b/src/server/dispense.c
index b05c81c..8ec7c2e 100644 (file)
--- 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) )