diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-06 12:59:12 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-06 12:59:12 +0000 |
| commit | 71392bc0305b06e18c99892d0a5b3fb4aaaf22c9 (patch) | |
| tree | bcc6bedfb729d9b4e20baaba984c674b4642b946 /src/map/map.c | |
| parent | 09a89593b983a9ade807175192fcf63971748f7c (diff) | |
| download | hercules-71392bc0305b06e18c99892d0a5b3fb4aaaf22c9.tar.gz hercules-71392bc0305b06e18c99892d0a5b3fb4aaaf22c9.tar.bz2 hercules-71392bc0305b06e18c99892d0a5b3fb4aaaf22c9.tar.xz hercules-71392bc0305b06e18c99892d0a5b3fb4aaaf22c9.zip | |
- The default event script behaviour is to trigger on labels rather than NPCs now.
- Removed several script config options which break NPC compatibility when you mess with them (event_script_type, event_requires_trigger, die_event_name, kill_pc_event_name, kill_mob_event_name, logout_event_name, login_event_name, loadmap_event_name, baselvup_event_name, joblvup_event_name)
- LoadMap events no longer set the variable "@maploaded$" to the name of the new map.
- Optimized/simplified the code now that the previous config options were removed.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11859 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index d113e8a6d..7a8520061 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1683,9 +1683,8 @@ int map_quit(struct map_session_data *sd) if(!sd->state.waitingdisconnect) { if (sd->npc_timer_id != -1) //Cancel the event timer. npc_timerevent_quit(sd); - if (sd->state.event_disconnect) - npc_script_event(sd, NPCE_LOGOUT); + npc_script_event(sd, NPCE_LOGOUT); sd->state.waitingdisconnect = 1; if (sd->pd) unit_free(&sd->pd->bl,0); if (sd->hd) unit_free(&sd->hd->bl,0); |