git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://mutabah.net/opendispense2
[tpg/opendispense2.git]
/
src
/
server
/
common.h
diff --git
a/src/server/common.h
b/src/server/common.h
index
ec9e38a
..
34361b9
100644
(file)
--- a/
src/server/common.h
+++ b/
src/server/common.h
@@
-32,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
@@
-72,6
+73,7
@@
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);
@@
-80,7
+82,9
@@
extern char *mkstr(const char *Format, ...);
// --- Dispense ---
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 User, int ByUser, 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, ...);
UCC
git Repository :: git.ucc.asn.au