diff options
| author | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-19 11:59:28 +0800 |
|---|---|---|
| committer | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-19 11:59:28 +0800 |
| commit | de7919f0f59f47473e6de709b5d5287a4a55e18d (patch) | |
| tree | 5967ef231271682ebf9db27185e7e86bbdbc57d4 /src/map/itemdb.h | |
| parent | 98fe7e4770376ca66590b5a1e75ce3a848d032a9 (diff) | |
| parent | bd95eccf047bda9d72abcea0724ad34b31131ab0 (diff) | |
| download | hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.gz hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.bz2 hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.xz hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/itemdb.h')
| -rw-r--r-- | src/map/itemdb.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h index c441de26a..44b455d80 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -1,5 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena Dev Teams #ifndef _ITEMDB_H_ #define _ITEMDB_H_ @@ -22,11 +23,13 @@ #define MAX_ITEMS_PER_COMBO 6 enum item_itemid { + ITEMID_HOLY_WATER = 523, ITEMID_EMPERIUM = 714, ITEMID_YELLOW_GEMSTONE = 715, ITEMID_RED_GEMSTONE = 716, ITEMID_BLUE_GEMSTONE = 717, ITEMID_TRAP = 1065, + ITEMID_FACE_PAINT = 6120, ITEMID_STONE = 7049, ITEMID_SKULL_ = 7420, ITEMID_TOKEN_OF_SIEGFRIED = 7621, @@ -66,6 +69,7 @@ enum { ITEMID_CAMOUFLAGE_GENERATOR, ITEMID_HIGH_QUALITY_COOLER, ITEMID_SPECIAL_COOLER, + ITEMID_MONKEY_SPANNER = 6186, } mecha_item_list; enum { @@ -236,4 +240,16 @@ void itemdb_reload(void); void do_final_itemdb(void); int do_init_itemdb(void); +/* incomplete */ +struct itemdb_interface { + void (*reload) (void); + /* */ + int (*parse_dbrow) (char** str, const char* source, int line, int scriptopt); + struct item_data* (*exists) (int nameid); +} itemdb_s; + +struct itemdb_interface *itemdb; + +void itemdb_defaults(void); + #endif /* _ITEMDB_H_ */ |