Sfoglia il codice sorgente

* Crash fix in npc.c npc_timerevent.
was: struct timer_event_data *ted = (struct timer_event_data*)ted;
changed: struct timer_event_data *ted = (struct timer_event_data*)data;
Skotlex, I am assuming it's calling from the passed data var, If I'm wrong
please fix it. I just know what was there was definitely not correct. [Valaris]


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5168 54d463be-8e91-2dee-dedb-b68131a5f0ec

Valaris 19 anni fa
parent
commit
dacc1b195d
2 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 5 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/npc.c

+ 5 - 0
Changelog-Trunk.txt

@@ -5,6 +5,11 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/02/02
+	* Crash fix in npc.c npc_timerevent.
+	  was: struct timer_event_data *ted = (struct timer_event_data*)ted;
+	  changed: 	struct timer_event_data *ted = (struct timer_event_data*)data;
+	  Skotlex, I am assuming it's calling from the passed data var, If I'm wrong
+	  please fix it.  I just know what was there was definitely not correct. [Valaris]
 	* Improved the NPC timer system to enable 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

+ 1 - 1
src/map/npc.c

@@ -560,7 +560,7 @@ int npc_timerevent(int tid,unsigned int tick,int id,int data)
 	unsigned int old_tick;
 	struct npc_data* nd=(struct npc_data *)map_id2bl(id);
 	struct npc_timerevent_list *te;
-	struct timer_event_data *ted = (struct timer_event_data*)ted;
+	struct timer_event_data *ted = (struct timer_event_data*)data;
 	struct map_session_data *sd=NULL;
 	
 	if( nd==NULL ){