diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-04 05:54:16 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-04 05:54:16 +0000 |
| commit | ae971f9ae500a6fd31f5468dd7dab0f2b1ceff42 (patch) | |
| tree | a53198fefcdb55a7c3ff8bd71b0eac81ba90088c | |
| parent | ca6e392f184c64701f6b1d99f5a47cf6c3d81a22 (diff) | |
| download | hercules-ae971f9ae500a6fd31f5468dd7dab0f2b1ceff42.tar.gz hercules-ae971f9ae500a6fd31f5468dd7dab0f2b1ceff42.tar.bz2 hercules-ae971f9ae500a6fd31f5468dd7dab0f2b1ceff42.tar.xz hercules-ae971f9ae500a6fd31f5468dd7dab0f2b1ceff42.zip | |
* Merged changes up to eAthena 15073.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15540 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/itemdb.h | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 9df67ad70..acefa03c3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -13340,7 +13340,7 @@ void clif_parse_HomMenu(int fd, struct map_session_data *sd) /// 0292 void clif_parse_AutoRevive(int fd, struct map_session_data *sd) { - int item_position = pc_search_inventory(sd, 7621); + int item_position = pc_search_inventory(sd, ITEMID_TOKEN_OF_SIEGFRIED); if (item_position < 0) return; diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 79fc3aa5f..52addfb39 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -22,14 +22,19 @@ **/ #define ITEMID_ANCILLA 12333 -#define ITEMID_EMPERIUM 714 -#define ITEMID_YELLOW_GEMSTONE 715 -#define ITEMID_RED_GEMSTONE 716 -#define ITEMID_BLUE_GEMSTONE 717 +enum item_itemid +{ + ITEMID_EMPERIUM = 714, + ITEMID_YELLOW_GEMSTONE = 715, + ITEMID_RED_GEMSTONE = 716, + ITEMID_BLUE_GEMSTONE = 717, + ITEMID_TRAP = 1065, + ITEMID_STONE = 7049, + ITEMID_SKULL_ = 7420, + ITEMID_TOKEN_OF_SIEGFRIED = 7621, +}; + #define itemid_isgemstone(id) ( (id) >= ITEMID_YELLOW_GEMSTONE && (id) <= ITEMID_BLUE_GEMSTONE ) -#define ITEMID_TRAP 1065 -#define ITEMID_STONE 7049 -#define ITEMID_SKULL_ 7420 #define itemdb_iscashfood(id) ( (id) >= 12202 && (id) <= 12207 ) //The only item group required by the code to be known. See const.txt for the full list. |