summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-14 12:59:02 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-14 12:59:02 +0000
commit3ef5e3aff29d35833df8873c2356bfd57826bb01 (patch)
treefc5217fb1174cb6c844da6c1d76fd0f4680dd6fc /src/map
parentfc71573dc0e2558ad4c977534d716d971ac798f2 (diff)
downloadhercules-3ef5e3aff29d35833df8873c2356bfd57826bb01.tar.gz
hercules-3ef5e3aff29d35833df8873c2356bfd57826bb01.tar.bz2
hercules-3ef5e3aff29d35833df8873c2356bfd57826bb01.tar.xz
hercules-3ef5e3aff29d35833df8873c2356bfd57826bb01.zip
* extended the "npc_event: event queue is full" error message to also print the name of the event (so that the cause can be tracked down)
* removed a strange (and undocumented) event name check for "GM_MONSTER" in the npc event execution code * added effects from recent sakexes to effects list * removed ladmin from vs8 sql builds * added int_auction.c/.h to vs6 and vs7 project files * some small cleanups git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12362 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/npc.c5
-rw-r--r--src/map/pc.c6
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;