summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshinomori <shinomori@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-25 18:18:16 +0000
committershinomori <shinomori@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-25 18:18:16 +0000
commita4f7101ce88cca938f255778fd2dec80a68622a0 (patch)
treefc1c8eb36d0fed333d58c50e522f0342122019d0 /src/map
parent715a946678a9e44ed56528f822d2e199753b8049 (diff)
downloadhercules-a4f7101ce88cca938f255778fd2dec80a68622a0.tar.gz
hercules-a4f7101ce88cca938f255778fd2dec80a68622a0.tar.bz2
hercules-a4f7101ce88cca938f255778fd2dec80a68622a0.tar.xz
hercules-a4f7101ce88cca938f255778fd2dec80a68622a0.zip
wrong pc.h...
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1176 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/npc.c2
-rw-r--r--src/map/pc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 70f1e3dbb..36569eb88 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -156,7 +156,7 @@ int npc_event_dequeue(struct map_session_data *sd)
sd->eventtimer[ev]=add_timer(gettick()+100,pc_eventtimer,sd->bl.id,(int)name);//!!todo!!
}else
- ShowMessage("npc_event_dequeue: event timer is full !\n");
+ printf("npc_event_dequeue: event timer is full !\n");
}
return 0;
}
diff --git a/src/map/pc.h b/src/map/pc.h
index 4461dcb6c..242ae3147 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -199,7 +199,7 @@ int pc_delinvincibletimer(struct map_session_data *sd);
int pc_addspiritball(struct map_session_data *sd,int,int);
int pc_delspiritball(struct map_session_data *sd,int,int);
-int pc_eventtimer(int tid,unsigned long tick,int id,int data); // for npc_dequeue
+int pc_eventtimer(int tid,unsigned int tick,int id,int data); // for npc_dequeue
int do_init_pc(void);