diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-24 01:19:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 01:19:02 +0300 |
| commit | f241b6e550844c84cb9afec087f39360dbe5441a (patch) | |
| tree | 08981821ffb532b3571808e393359a8bf4fc8e17 /src/map/clif.h | |
| parent | fdc5307d320ae0e3eef2e2a8f1d939e91a552d10 (diff) | |
| parent | 2c5dcfe93a100d570d32ef5ff91c3336ec9d4e05 (diff) | |
| download | hercules-f241b6e550844c84cb9afec087f39360dbe5441a.tar.gz hercules-f241b6e550844c84cb9afec087f39360dbe5441a.tar.bz2 hercules-f241b6e550844c84cb9afec087f39360dbe5441a.tar.xz hercules-f241b6e550844c84cb9afec087f39360dbe5441a.zip | |
Merge pull request #1321 from HerculesWS/clif_fixes
Clif fixes
Diffstat (limited to 'src/map/clif.h')
| -rw-r--r-- | src/map/clif.h | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index 4d22fd4af..da0f2e21d 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -520,7 +520,7 @@ enum CLOSE_ROULETTE_ACK { /** * Reason for item deletion (clif->delitem) - */ + **/ enum delitem_reason { DELITEM_NORMAL = 0, /// Normal DELITEM_SKILLUSE = 1, /// Item used for a skill @@ -532,9 +532,9 @@ enum delitem_reason { DELITEM_ANALYSIS = 7, /// Consumed by Four Spirit Analysis (SO_EL_ANALYSIS) skill }; -/* -* Merge items reasons -*/ +/** + * Merge items reasons + **/ enum mergeitem_reason { MERGEITEM_SUCCESS = 0x0, @@ -543,6 +543,23 @@ enum mergeitem_reason { }; /** + * Clif Unit Type + **/ +enum clif_unittype { + CLUT_PC = 0x0, + CLUT_NPC = 0x1, + CLUT_ITEM = 0x2, + CLUT_SKILL = 0x3, + CLUT_UNKNOW = 0x4, + CLUT_MOB = 0x5, + CLUT_EVENT = 0x6, + CLUT_PET = 0x7, + CLUT_HOMNUCLUS = 0x8, + CLUT_MERCNARY = 0x9, + CLUT_ELEMENTAL = 0xa, +}; + +/** * Structures **/ typedef void (*pFunc)(int, struct map_session_data *); //cant help but put it first @@ -1091,7 +1108,9 @@ struct clif_interface { 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); - + /* */ + bool (*isdisguised) (struct block_list* bl); + unsigned char (*bl_type) (struct block_list *bl); /*------------------------ *- Parse Incoming Packet *------------------------*/ |