X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fitemdb.c;h=49fb743dd609302cba0104ab4b3ca377b9aa4c2c;hb=470cc8029bc931275ce82dd33709ba90c4f4c62f;hp=dc188fdc2d63859bfbc5f082a632295d96de5ee2;hpb=4fef498619ca05876568c6bc5114fadd7c2496ee;p=tpg%2Fopendispense2.git

diff --git a/src/server/itemdb.c b/src/server/itemdb.c
index dc188fd..49fb743 100644
--- a/src/server/itemdb.c
+++ b/src/server/itemdb.c
@@ -31,7 +31,7 @@ char	*trim(char *__str);
  int	giNumItems = 0;
 tItem	*gaItems = NULL;
 time_t	gItems_LastUpdated;
-tHandler	gPseudo_Handler = {Name:"pseudo"};
+tHandler	gPseudo_Handler = {.Name="pseudo"};
 tHandler	*gaHandlers[] = {&gPseudo_Handler, &gCoke_Handler, &gSnack_Handler, &gDoor_Handler};
  int	giNumHandlers = sizeof(gaHandlers)/sizeof(gaHandlers[0]);
 char	*gsItemListFile = DEFAULT_ITEM_FILE;
@@ -81,7 +81,7 @@ void ItemList_Changed(int signum)
 #endif
 
 /**
- * \brief Read the initiali item list
+ * \brief Read the initial item list
  */
 void Load_Itemlist(void)
 {
@@ -263,6 +263,8 @@ void Items_UpdateFile(void)
 		 int	num;
 		tHandler	*handler;
 
+		trim(buffer);
+
 		lineNum ++;
 		line_items[lineNum-1] = -1;
 		line_comments[lineNum-1] = NULL;
@@ -326,7 +328,8 @@ void Items_UpdateFile(void)
 	
 	fclose(fp);
 	
-	fp = fopen("items.cfg.new", "w");	// DEBUG: Don't kill the real item file until debugged
+	//fp = fopen("items.cfg.new", "w");	// DEBUG: Don't kill the real item file until debugged
+	fp = fopen(gsItemListFile, "w");
 	
 	// Create new file
 	{
@@ -342,8 +345,11 @@ void Items_UpdateFile(void)
 				if( done_items[ line_items[i] ] ) {
 					fprintf(fp, "; DUP -");
 				}
-				
 				done_items[ line_items[i] ] = 1;
+				
+				if( item->bHidden )
+					fprintf(fp, "-");
+				
 				fprintf(fp, "%s\t%i\t%i\t%s\t",
 					item->Handler->Name, item->ID, item->Price, item->Name
 					);
@@ -363,6 +369,9 @@ void Items_UpdateFile(void)
 			tItem	*item = &gaItems[i];
 			if( done_items[i] )	continue ;
 			
+			if( item->bHidden )
+				fprintf(fp, "-");
+			
 			fprintf(fp, "%s\t%i\t%i\t%s\n",
 				item->Handler->Name, item->ID, item->Price, item->Name
 				);