diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
| commit | 29f4963673b1f793448a083a21be3e6ae4d69c54 (patch) | |
| tree | 8722f2e506fc7ba97070a79739f819f0ade4f03d /src/map/clif.h | |
| parent | fb82e87c39227921fc3397a8763f0bdb0921a28b (diff) | |
| parent | 7b1293c3caf76b5587aa3abe8df57b1083c2175d (diff) | |
| download | hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.gz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.bz2 hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.xz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
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 *------------------------*/ |