diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/npc.c | 5 | ||||
| -rw-r--r-- | src/map/pc.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 5ed3f4e2d..4b6231cf0 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -640,7 +640,7 @@ int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char if( i < MAX_EVENTQUEUE ) safestrncpy(sd->eventqueue[i],eventname,50); //Event enqueued. else - ShowWarning("npc_event: event queue is full !\n"); + ShowWarning("npc_event: player's event queue is full, can't add event '%s' !\n", eventname); return 1; } @@ -678,8 +678,7 @@ int npc_event(struct map_session_data* sd, const char* eventname, int mob_kill) strcat( mobevent, "::OnMyMobDead"); ev = strdb_get(ev_db, mobevent); if (ev == NULL || (nd = ev->nd) == NULL) { - if (strnicmp(eventname, "GM_MONSTER",10) != 0) - ShowError("npc_event: (mob_kill) event not found [%s]\n", mobevent); + ShowError("npc_event: (mob_kill) event not found [%s]\n", mobevent); return 0; } } else { diff --git a/src/map/pc.c b/src/map/pc.c index 1065bb788..782446c42 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3432,9 +3432,8 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y return 1; } - m=map_mapindex2mapid(mapindex); - - if( (sd->state.changemap = (sd->mapindex != mapindex)) ) + sd->state.changemap = (sd->mapindex != mapindex); + if( sd->state.changemap ) { //Misc map-changing settings if (sd->sc.count) { //Cancel some map related stuff. @@ -3463,6 +3462,7 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y sd->regen.state.gc = 0; } + m=map_mapindex2mapid(mapindex); if(m<0) { uint32 ip; uint16 port; |