diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-24 12:14:18 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-24 12:14:18 +0000 |
commit | 3ecde465534c93315a1f88430129e8400f4d9fe2 (patch) | |
tree | fb1153e7be48da7d89b9697be733124650045fdf /src/map/npc.c | |
parent | 04580084c4ac2113d06a23fdf2ca4596dd04011b (diff) | |
download | hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.tar.gz hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.tar.bz2 hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.tar.xz hercules-3ecde465534c93315a1f88430129e8400f4d9fe2.zip |
* Cleaned up some messy guild code (more to come)
* Cleaned up the mail code, no more pointless dynamic allocation
* Added upgrade_svn11548.sql to convert the mail table to new format
* Updated vs7 and vs6 project files
* Increased the max. send buffer size to 5M since 1M is not enough
* Please complain if something stops working ^^;
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11571 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r-- | src/map/npc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index b2de0af2a..87ceb8afb 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -337,19 +337,16 @@ int npc_event_do_clock(int tid, unsigned int tick, int id, int data) memcpy(&ev_tm_b,t,sizeof(ev_tm_b)); return c; } + /*========================================== * OnInitイベント実行(&時計イベント開始) *------------------------------------------*/ -int npc_event_do_oninit(void) +void npc_event_do_oninit(void) { -// int c = npc_event_doall("OnInit"); - ShowStatus("Event '"CL_WHITE"OnInit"CL_RESET"' executed with '" - CL_WHITE"%d"CL_RESET"' NPCs.\n",npc_event_doall("OnInit")); - - add_timer_interval(gettick()+100, - npc_event_do_clock,0,0,1000); + int count = npc_event_doall("OnInit"); + ShowStatus("Event '"CL_WHITE"OnInit"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs."CL_CLL"\n", count); - return 0; + add_timer_interval(gettick()+100,npc_event_do_clock,0,0,1000); } /*========================================== |