diff options
| author | Valaris <Valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-03 01:51:44 +0000 |
|---|---|---|
| committer | Valaris <Valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-03 01:51:44 +0000 |
| commit | d0bc19a7b5eba41b14599bf92ad87912fd3f44fb (patch) | |
| tree | 01d724708c31d710d142559f74000341197a7770 | |
| parent | 68503609ec28be3fa2c4eb0d66b0ce0ea8815cee (diff) | |
| download | hercules-d0bc19a7b5eba41b14599bf92ad87912fd3f44fb.tar.gz hercules-d0bc19a7b5eba41b14599bf92ad87912fd3f44fb.tar.bz2 hercules-d0bc19a7b5eba41b14599bf92ad87912fd3f44fb.tar.xz hercules-d0bc19a7b5eba41b14599bf92ad87912fd3f44fb.zip | |
* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5168 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 967e68d0d..21e5642a4 100644 --- a/Changelog-Trunk.txt +++ b/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
diff --git a/src/map/npc.c b/src/map/npc.c index b56fcd605..e3517458b 100644 --- a/src/map/npc.c +++ b/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 ){
|