Merge pull request #1 from HerculesWS/master

Update from original

1 files changed, 9 insertions, 8 deletions

diff --git a/src/map/vending.h b/src/map/vending.h
index 0148deb71..63cb632a9 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -2,25 +2,26 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#ifndef	_VENDING_H_
-#define	_VENDING_H_
+#ifndef MAP_VENDING_H
+#define MAP_VENDING_H
 
 #include "../common/cbasetypes.h"
 #include "../common/db.h"
+
 struct map_session_data;
 struct s_search_store_search;
 
 struct s_vending {
 	short index; //cart index (return item data)
-	short amount; //amout of the item for vending
-	unsigned int value; //at wich price
+	short amount; //amount of the item for vending
+	unsigned int value; //at which price
 };
 
 struct vending_interface {
 	unsigned int next_id;/* next vender id */
 	DBMap *db;
 	/* */
-	void (*init) (void);
+	void (*init) (bool minimal);
 	void (*final) (void);
 	/* */
 	void (*close) (struct map_session_data* sd);
@@ -29,10 +30,10 @@ struct vending_interface {
 	void (*purchase) (struct map_session_data* sd, int aid, unsigned int uid, const uint8* data, int count);
 	bool (*search) (struct map_session_data* sd, unsigned short nameid);
 	bool (*searchall) (struct map_session_data* sd, const struct s_search_store_search* s);
-} vending_s;
+};
 
-struct vending_interface * vending;
+struct vending_interface *vending;
 
 void vending_defaults(void);
 
-#endif /* _VENDING_H_ */
+#endif /* MAP_VENDING_H */