summaryrefslogtreecommitdiff
path: root/src/map/itemdb.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-06 21:23:31 -0200
committershennetsind <ind@henn.et>2013-11-06 21:23:31 -0200
commitd56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch)
treea47bd0ef6340ce1d011d198f430c7d96d620afe0 /src/map/itemdb.h
parent5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff)
parent3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff)
downloadhercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz
hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2
hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz
hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/pc.c
Diffstat (limited to 'src/map/itemdb.h')
-rw-r--r--src/map/itemdb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 2579d84ca..80d2fd0ce 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -266,7 +266,7 @@ struct item_package {
#define itemdb_canauction(item, gmlv) itemdb->isrestricted(item , gmlv, 0, itemdb->canauction_sub)
struct itemdb_interface {
- void (*init) (void);
+ void (*init) (bool minimal);
void (*final) (void);
void (*reload) (void);
void (*name_constants) (void);
@@ -343,7 +343,7 @@ struct itemdb_interface {
int (*read_sqldb) (void);
uint64 (*unique_id) (int8 flag, int64 value);
int (*uid_load) ();
- void (*read) (void);
+ void (*read) (bool minimal);
void (*destroy_item_data) (struct item_data *self, int free_self);
int (*final_sub) (DBKey key, DBData *data, va_list ap);
};