diff options
| author | Haruna <haru@dotalux.com> | 2014-12-06 19:07:53 +0100 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2014-12-06 19:07:53 +0100 |
| commit | 17ac03365ce89ad770cc4d7f9e802ad0847a1ebc (patch) | |
| tree | 3f6b97440e15b755b8e95f8d775e8eb66967d5e6 /src/map/map.c | |
| parent | 738e39d33186a4ff1a620509a7c13d986ff43ecb (diff) | |
| parent | 115104e15373eb83f8b7fd2c5681fc1305d5d402 (diff) | |
| download | hercules-17ac03365ce89ad770cc4d7f9e802ad0847a1ebc.tar.gz hercules-17ac03365ce89ad770cc4d7f9e802ad0847a1ebc.tar.bz2 hercules-17ac03365ce89ad770cc4d7f9e802ad0847a1ebc.tar.xz hercules-17ac03365ce89ad770cc4d7f9e802ad0847a1ebc.zip | |
Merge pull request #405 from 4144/clifext
Extend clif.c
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c index 3cb4de5c8..2c1495f32 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1787,7 +1787,7 @@ int map_quit(struct map_session_data *sd) { if( sd->bg_id && !sd->bg_queue.arena ) /* TODO: dump this chunk after bg_queue is fully enabled */ bg->team_leave(sd,BGTL_QUIT); - if( sd->state.autotrade && runflag != MAPSERVER_ST_SHUTDOWN && !hChSys.closing ) + if (sd->state.autotrade && runflag != MAPSERVER_ST_SHUTDOWN && !clif->hChSys->closing) pc->autotrade_update(sd,PAUC_REMOVE); skill->cooldown_save(sd); @@ -1844,7 +1844,7 @@ int map_quit(struct map_session_data *sd) { unit->remove_map(&sd->ed->bl,CLR_TELEPORT,ALC_MARK); } - if( hChSys.local && map->list[sd->bl.m].channel && idb_exists(map->list[sd->bl.m].channel->users, sd->status.char_id) ) { + if (clif->hChSys->local && map->list[sd->bl.m].channel && idb_exists(map->list[sd->bl.m].channel->users, sd->status.char_id)) { clif->chsys_left(map->list[sd->bl.m].channel,sd); } @@ -5340,7 +5340,7 @@ int do_final(void) { ShowStatus("Terminating...\n"); - hChSys.closing = true; + clif->hChSys->closing = true; HPM->event(HPET_FINAL); if (map->cpsd) aFree(map->cpsd); |