X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fcommon.h;h=34361b950f97c0e0a1457c04ff720f3fa1df2548;hb=ec400f11ebc2e81079e464145915fb2d25602fbc;hp=ded278bce2e297606dee99ced06e4b33d3e6cf19;hpb=41eba5abceaa60bac8b33025f765d798f26e2062;p=tpg%2Fopendispense2.git

diff --git a/src/server/common.h b/src/server/common.h
index ded278b..34361b9 100644
--- a/src/server/common.h
+++ b/src/server/common.h
@@ -10,6 +10,7 @@
 #define _COMMON_H_
 
 #include <regex.h>
+#include "../cokebank.h"
 
 // === CONSTANTS ===
 #define	DEFAULT_CONFIG_FILE	"/etc/opendispense/main.cfg"
@@ -19,6 +20,8 @@
 #define _EXPSTR(x)	#x
 #define EXPSTR(x)	_EXPSTR(x)
 
+#define UNUSED(var)	unused__##var __attribute__((__unused__))
+
 // === STRUCTURES ===
 typedef struct sItem	tItem;
 typedef struct sUser	tUser;
@@ -29,6 +32,7 @@ struct sItem
 {
 	char	*Name;	//!< Display Name
 	 int	Price;	//!< Price
+	 int	bHidden;	//!< Hidden item?
 	
 	tHandler	*Handler;	//!< Handler for the item
 	short	ID;	//!< Item ID
@@ -69,24 +73,21 @@ extern int	giDebugLevel;
 
 // === FUNCTIONS ===
 // --- Helpers --
+extern void	AddPeriodicFunction(void (*Fcn)(void));
 extern void	CompileRegex(regex_t *Regex, const char *Pattern, int Flags);
 extern int	RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage);
 extern int	InitSerial(const char *Path, int BaudRate);
 extern char	*mkstr(const char *Format, ...);
 
 // --- Dispense ---
-extern int	DispenseItem(int User, tItem *Item);
-extern int	DispenseGive(int SrcUser, int DestUser, int Ammount, const char *ReasonGiven);
-extern int	DispenseAdd(int User, int ByUser, int Ammount, const char *ReasonGiven);
+extern int	DispenseItem(int ActualUser, int User, tItem *Item);
+extern int	DispenseGive(int ActualUser, int SrcUser, int DestUser, int Ammount, const char *ReasonGiven);
+extern int	DispenseAdd(int ActualUser, int User, int Ammount, const char *ReasonGiven);
+extern int	DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven);
+extern int	DispenseDonate(int ActualUser, int User, int Ammount, const char *ReasonGiven);
 
 // --- Logging ---
 extern void	Log_Error(const char *Format, ...);
 extern void	Log_Info(const char *Format, ...);
 
-// --- Cokebank Functions ---
-extern int	Transfer(int SourceUser, int DestUser, int Ammount, const char *Reason);
-extern int	GetBalance(int User);
-extern char	*GetUserName(int User);
-extern int	GetUserID(const char *Username);
-
 #endif