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
Client - Broke the client out into separate files
[tpg/opendispense2.git]
/
src
/
server
/
itemdb.c
diff --git
a/src/server/itemdb.c
b/src/server/itemdb.c
index
49fb743
..
632eb50
100644
(file)
--- a/
src/server/itemdb.c
+++ b/
src/server/itemdb.c
@@
-16,6
+16,8
@@
#include <sys/stat.h>
#include <time.h>
#include <sys/stat.h>
#include <time.h>
+#define DUMP_ITEMS 0
+
// === IMPORTS ===
extern tHandler gCoke_Handler;
extern tHandler gSnack_Handler;
// === IMPORTS ===
extern tHandler gCoke_Handler;
extern tHandler gSnack_Handler;
@@
-169,7
+171,9
@@
void Items_ReadFromFile(void)
price = atoi( line + matches[3].rm_so );
desc = line + matches[4].rm_so;
price = atoi( line + matches[3].rm_so );
desc = line + matches[4].rm_so;
+ #if DUMP_ITEMS
printf("Item '%s' - %i cents, %s:%i\n", desc, price, type, num);
printf("Item '%s' - %i cents, %s:%i\n", desc, price, type, num);
+ #endif
handler = NULL;
for( i = 0; i < giNumHandlers; i ++ )
handler = NULL;
for( i = 0; i < giNumHandlers; i ++ )
@@
-190,7
+194,9
@@
void Items_ReadFromFile(void)
if( items[i].Handler != handler ) continue;
if( items[i].ID != num ) continue;
if( items[i].Handler != handler ) continue;
if( items[i].ID != num ) continue;
+ #if DUMP_ITEMS
printf("Redefinition of %s:%i, updated\n", handler->Name, num);
printf("Redefinition of %s:%i, updated\n", handler->Name, num);
+ #endif
items[i].Price = price;
free(items[i].Name);
items[i].Name = strdup(desc);
items[i].Price = price;
free(items[i].Name);
items[i].Name = strdup(desc);
@@
-201,7
+207,10
@@
void Items_ReadFromFile(void)
items = realloc( items, (numItems + 1)*sizeof(items[0]) );
items[numItems].Handler = handler;
items[numItems].ID = num;
items = realloc( items, (numItems + 1)*sizeof(items[0]) );
items[numItems].Handler = handler;
items[numItems].ID = num;
- items[numItems].Price = price;
+ if( gbNoCostMode )
+ items[numItems].Price = 0;
+ else
+ items[numItems].Price = price;
items[numItems].Name = strdup(desc);
items[numItems].bHidden = (line[0] == '-');
numItems ++;
items[numItems].Name = strdup(desc);
items[numItems].bHidden = (line[0] == '-');
numItems ++;
UCC
git Repository :: git.ucc.asn.au