diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-02 21:26:53 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-02 21:26:53 +0000 |
| commit | 68503609ec28be3fa2c4eb0d66b0ce0ea8815cee (patch) | |
| tree | 9f8c79c6424a9030baf7b6afce60bdbe2dfb1176 /src/map/map.c | |
| parent | cba97f4deb4a9bb62da4ab7748926fd5319090d0 (diff) | |
| download | hercules-68503609ec28be3fa2c4eb0d66b0ce0ea8815cee.tar.gz hercules-68503609ec28be3fa2c4eb0d66b0ce0ea8815cee.tar.bz2 hercules-68503609ec28be3fa2c4eb0d66b0ce0ea8815cee.tar.xz hercules-68503609ec28be3fa2c4eb0d66b0ce0ea8815cee.zip | |
- Improved the NPC timer system to enable to have multiple timers going on at a time with different players attached to each. Now npc event timers are of two types: attached or global. The global timers don't have a player attached and can be started/halted by anyone. The character timers have a player attached, and they can only be stopped by a script that has the same player attached.
- Now player attached scripts will auto-abort when the atteched player quits the map server.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5167 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c index 222ada48a..ab2a13ec7 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1475,6 +1475,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) {
if (script_config.event_script_type == 0) {
struct npc_data *npc;
|