diff options
| author | Haru <haru@dotalux.com> | 2016-04-19 15:26:36 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-04-23 18:42:57 +0200 |
| commit | 2b1dce1e4acf46941657cab6da008c774f52de7c (patch) | |
| tree | 008455c1ef1f50c4b2eb8e26f18262f26d9dc5d7 /src/map/skill.c | |
| parent | 3af03d2a2e8f2054f9a44e272505b1a74d6bdaf6 (diff) | |
| download | hercules-2b1dce1e4acf46941657cab6da008c774f52de7c.tar.gz hercules-2b1dce1e4acf46941657cab6da008c774f52de7c.tar.bz2 hercules-2b1dce1e4acf46941657cab6da008c774f52de7c.tar.xz hercules-2b1dce1e4acf46941657cab6da008c774f52de7c.zip | |
Changed map_session_data::chatID to int (and renamed to chat_id)
- Chat IDs are signed integers.
- Resolves various warnings, depending on the compiler settings.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 31be52ae3..d3cb8d0be 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11716,7 +11716,7 @@ int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int64 tick if (bl->type == BL_PC && !working) { struct map_session_data *sd = BL_UCAST(BL_PC, bl); - if ((!sd->chatID || battle_config.chat_warpportal) && sd->ud.to_x == src->bl.x && sd->ud.to_y == src->bl.y) { + if ((sd->chat_id == 0 || battle_config.chat_warpportal) && sd->ud.to_x == src->bl.x && sd->ud.to_y == src->bl.y) { int x = sg->val2>>16; int y = sg->val2&0xffff; int count = sg->val1>>16; @@ -13122,7 +13122,8 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id nullpo_ret(sd); - if (sd->chatID) return 0; + if (sd->chat_id != 0) + return 0; if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id) { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] @@ -14088,7 +14089,7 @@ int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id, nullpo_ret(sd); - if( sd->chatID ) + if (sd->chat_id != 0) return 0; if( pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id ) { |