summaryrefslogtreecommitdiff
path: root/src/map/npc.h
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-01 21:15:57 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-01 21:15:57 +0000
commita6ba6ca70419e7f6db413c3581aee6e90dc87b0a (patch)
tree8f7f1e068fc2f9bae7e7ff041eb8c3dc83e0e887 /src/map/npc.h
parentb1d22b02963b16c4edcce0cd5d2bc521d97348f9 (diff)
downloadhercules-a6ba6ca70419e7f6db413c3581aee6e90dc87b0a.tar.gz
hercules-a6ba6ca70419e7f6db413c3581aee6e90dc87b0a.tar.bz2
hercules-a6ba6ca70419e7f6db413c3581aee6e90dc87b0a.tar.xz
hercules-a6ba6ca70419e7f6db413c3581aee6e90dc87b0a.zip
- Fixed the server crashing on startup due to bad define
- Fixed the server crashing on a timer-queued disguise / undisguise (no sd check) - re-added the item_group_list for consistency's sake, moved to itemdb.h (after some hacking to remove the ugly map.h dependency) - Removed some overly verbose item group messages & code git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10112 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.h')
-rw-r--r--src/map/npc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.h b/src/map/npc.h
index f4c092dc0..1d5a43367 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -37,7 +37,7 @@ struct view_data* npc_get_viewdata(int class_);
int npc_chat_sub(struct block_list *bl, va_list ap);
int npc_event_dequeue(struct map_session_data *sd);
int npc_event_timer(int tid,unsigned int tick,int id,int data);
-int npc_event(struct map_session_data *sd,const unsigned char *npcname,int);
+int npc_event(struct map_session_data *sd, const unsigned char *eventname, int mob_kill);
int npc_timer_event(const unsigned char *eventname); // Added by RoVeRT
int npc_command(struct map_session_data* sd, const char* npcname, const char* command);
int npc_touch_areanpc(struct map_session_data *,int,int,int);