diff options
| author | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
| commit | 041e0625b543215e8b319fc4ef32fa24cd199656 (patch) | |
| tree | 4f36abbb84364ad48c53f1f8bc6db007b01a20f6 /src/map/clif.h | |
| parent | 5fd40de233d3a897284f771338cbf8e657182261 (diff) | |
| parent | 856b6f1feb25ca74d716a4c22fff650e0ff065a0 (diff) | |
| download | hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.gz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.bz2 hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.xz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.zip | |
Merge pull request #586 from hemagx/master
Update UID system to match official and Implement Merger
Diffstat (limited to 'src/map/clif.h')
| -rw-r--r-- | src/map/clif.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index 66dd13304..c827406ca 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -522,6 +522,16 @@ enum delitem_reason { DELITEM_ANALYSIS = 7, /// Consumed by Four Spirit Analysis (SO_EL_ANALYSIS) skill }; +/* +* Merge items reasons +*/ + +enum mergeitem_reason { + MERGEITEM_SUCCESS = 0x0, + MERGEITEM_FAILD = 0x1, + MERGEITEM_MAXCOUNTFAILD = 0x2, +}; + /** * Structures **/ @@ -542,6 +552,11 @@ struct cdelayed_damage { struct block_list bl; }; +struct merge_item { + int16 position; + int16 nameid; +}; + /** * Vars **/ @@ -1062,6 +1077,12 @@ struct clif_interface { /* */ bool (*parse_roulette_db) (void); void (*roulette_generate_ack) (struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, short bonusItemID); + /* Merge Items */ + void (*openmergeitem) (int fd, struct map_session_data *sd); + void (*cancelmergeitem) (int fd, struct map_session_data *sd); + int (*comparemergeitem) (const void *a, const void *b); + void (*ackmergeitems) (int fd, struct map_session_data *sd); + /*------------------------ *- Parse Incoming Packet *------------------------*/ |