- 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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/map/map.h b/src/map/map.h
index b41f4f1f0..960e99424 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -491,6 +491,7 @@ struct map_session_data {
 	unsigned char *npc_script,*npc_scriptroot;

 	int  npc_scriptstate;

 	char npc_str[256];

+	int npc_timer_id; //For player attached npc timers. [Skotlex]

 	unsigned int chatID;

 	time_t idletime;

 

@@ -786,7 +787,7 @@ struct npc_data {
 			unsigned char *script;

 			short xs,ys;

 			int guild_id;

-			int timer,timerid,timeramount,nexttimer,rid;

+			int timer,timerid,timeramount,rid;

 			unsigned int timertick;

 			struct npc_timerevent_list *timer_event;

 			int label_list_num;