diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-06 14:54:40 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-06 14:54:40 +0000 |
| commit | e4847c600ebccbfbfcc9b37e797924aaac224c11 (patch) | |
| tree | 560ba525e431221bf36303ea57f984b886bdcdf7 /src/map | |
| parent | 7ada5312d478e4f56e8829779eb8c977877c99c2 (diff) | |
| download | hercules-e4847c600ebccbfbfcc9b37e797924aaac224c11.tar.gz hercules-e4847c600ebccbfbfcc9b37e797924aaac224c11.tar.bz2 hercules-e4847c600ebccbfbfcc9b37e797924aaac224c11.tar.xz hercules-e4847c600ebccbfbfcc9b37e797924aaac224c11.zip | |
- Fixed npc_event doing a map-check when the npc is not on any map.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5473 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/npc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index a8765995e..184b56eea 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -822,7 +822,7 @@ int npc_event (struct map_session_data *sd, const unsigned char *eventname, int xs=nd->u.scr.xs;
ys=nd->u.scr.ys;
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;
if ( xs>0 && (sd->bl.x<nd->bl.x-xs/2 || nd->bl.x+xs/2<sd->bl.x) )
return 1;
|