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

- Fixed npc_event doing a map-check when the npc is not on any map.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5473 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-03-06 14:54:40 +00:00
parent 2b874adf3c
commit b9b3055897
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -5,6 +5,8 @@ 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/03/06 2006/03/06
* Fixed npc_event doing a map-check when the npc is not on any map.
[Skotlex]
* Fixed a debug message showing up on skill castend nodamage id when using * Fixed a debug message showing up on skill castend nodamage id when using
a guild skill. [Skotlex] a guild skill. [Skotlex]
* Fixed #save not working on maps not in the current map server. [Skotlex] * Fixed #save not working on maps not in the current map server. [Skotlex]

2
src/map/npc.c
View File

@ -822,7 +822,7 @@ int npc_event (struct map_session_data *sd, const unsigned char *eventname, int
xs=nd->u.scr.xs; xs=nd->u.scr.xs;
ys=nd->u.scr.ys; ys=nd->u.scr.ys;
if (xs>=0 && ys>=0 && (strcmp(((eventname)+strlen(eventname)-6),"Global") != 0) ) { if (xs>=0 && ys>=0 && (strcmp(((eventname)+strlen(eventname)-6),"Global") != 0) ) {
if (nd->bl.m != sd->bl.m ) if (nd->bl.m >= 0 && nd->bl.m != sd->bl.m )
return 1; return 1;
if ( xs>0 && (sd->bl.x<nd->bl.x-xs/2 || nd->bl.x+xs/2<sd->bl.x) ) if ( xs>0 && (sd->bl.x<nd->bl.x-xs/2 || nd->bl.x+xs/2<sd->bl.x) )
return 1; return 1;