From 4459a6244d44f3be68b01164ae52e3a2f212475e Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Fri, 6 Feb 2009 18:47:30 +0000 Subject: * Follow up to r13485. (bugreport:2741) - @spiritball creates spiritballs without timer (limited to the array size instead of 500) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13509 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 89e9f1282..a5ce1d6b5 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -178,7 +178,7 @@ int pc_addspiritball(struct map_session_data *sd,int interval,int max) } tid = add_timer(gettick()+interval, pc_spiritball_timer, sd->bl.id, 0); - ARR_FIND(0, sd->spiritball, i, DIFF_TICK(get_timer(tid)->tick, get_timer(sd->spirit_timer[i])->tick) < 0); + ARR_FIND(0, sd->spiritball, i, sd->spirit_timer[i] == INVALID_TIMER || DIFF_TICK(get_timer(tid)->tick, get_timer(sd->spirit_timer[i])->tick) < 0); if( i != sd->spiritball ) memmove(sd->spirit_timer+i+1, sd->spirit_timer+i, (sd->spiritball-i)*sizeof(int)); sd->spirit_timer[i] = tid; @@ -199,6 +199,8 @@ int pc_delspiritball(struct map_session_data *sd,int count,int type) return 0; } + if(count <= 0) + return 0; if(count > sd->spiritball) count = sd->spiritball; sd->spiritball -= count; -- cgit v1.2.3-60-g2f50