More cleanup, implementing `dispense give`

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

diff --git a/src/server/dispense.c b/src/server/dispense.c
index 09b2c4f..d574a1e 100644 (file)
--- a/src/server/dispense.c
+++ b/src/server/dispense.c
@@ -14,6 +14,7 @@ int DispenseItem(int User, tItem *Item)
         int    ret;
        tHandler        *handler;
        char    *username;
+       char    *reason;
        
        handler = Item->Handler;
        
@@ -22,11 +23,12 @@ int DispenseItem(int User, tItem *Item)
                ret = handler->CanDispense( User, Item->ID );
                if(ret) return 1;       // 1: Unable to dispense
        }
-       
+
        // Subtract the balance
-       ret = Transfer( User, GetUserID(">sales"), Item->Price, "" );
-       // What value should I use for this error?
-       // AlterBalance should return the final user balance
+       reason = mkstr("Dispense - %s:%i %s", handler->Name, Item->ID, Item->Name);
+       if( !reason )   reason = Item->Name;    // TODO: Should I instead return an error?
+       ret = Transfer( User, GetUserID(">sales"), Item->Price, reason);
+       free(reason);
        if(ret) return 2;       // 2: No balance
        
        // Get username for debugging
@@ -45,11 +47,29 @@ int DispenseItem(int User, tItem *Item)
        }
        
        // And log that it happened
-       Log_Info("Dispensed %s (%i:%i) for %s [cost %i, balance %i cents]",
-               Item->Name, handler->Name, Item->ID,
-               username, Item->Price, GetBalance(User)
+       Log_Info("%s dispensed %s (%s:%i) [cost %i, balance %i cents]",
+               username, Item->Name, handler->Name, Item->ID,
+               Item->Price, GetBalance(User)
                );
        
        free( username );
        return 0;       // 0: EOK
 }
+
+/**
+ * \brief Give money from one user to another
+ */
+int DispenseGive(int SrcUser, int DestUser, int Ammount, const char *ReasonGiven)
+{
+        int    ret;
+       if( Ammount < 0 )       return 1;       // Um... negative give? Not on my watch
+       
+       ret = Transfer( SrcUser, DestUser, Ammount, ReasonGiven );
+       if(ret) return 2;       // No Balance
+       
+       Log_Info("%s gave %i to %s (%s)",
+               GetUserName(SrcUser), Ammount, GetUserName(DestUser), ReasonGiven
+               );
+       
+       return 0;
+}