Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Crash fix in npc.c npc_timerevent.

Browse Source 
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
This commit is contained in:
Valaris 2006-02-03 01:51:44 +00:00
parent 28c32a9532
commit dacc1b195d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog-Trunk.txt
View File

@ -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 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/02 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 * 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 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 two types: attached or global. The global timers don't have a player

2
src/map/npc.c
View File

@ -560,7 +560,7 @@ int npc_timerevent(int tid,unsigned int tick,int id,int data)
unsigned int old_tick; unsigned int old_tick;
struct npc_data* nd=(struct npc_data *)map_id2bl(id); struct npc_data* nd=(struct npc_data *)map_id2bl(id);
struct npc_timerevent_list *te; 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; struct map_session_data *sd=NULL;
if( nd==NULL ){ if( nd==NULL ){