summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c15
-rw-r--r--src/map/pc.c4
2 files changed, 10 insertions, 9 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index a4641b882..e5cd1c9e5 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3713,20 +3713,19 @@ int atcommand_lostskill(const int fd, struct map_session_data* sd, const char* c
*------------------------------------------*/
int atcommand_spiritball(const int fd, struct map_session_data* sd, const char* command, const char* message)
{
+ int max_spiritballs = min(ARRAYLENGTH(sd->spirit_timer), 0x7FFF);
int number;
nullpo_retr(-1, sd);
- if (!message || !*message || (number = atoi(message)) < 0) {
- clif_displaymessage(fd, "Please, enter a spirit ball number (usage: @spiritball <number: 0-1000>).");
+ if (!message || !*message || (number = atoi(message)) < 0 || number >= max_spiritballs) {
+ char msg[256];
+ safesnprintf(msg, sizeof(msg), "Please, enter a spirit ball number (usage: @spiritball <number: 0-%d>).", max_spiritballs);
+ clif_displaymessage(fd, msg);
return -1;
}
- // set max number to avoid server/client crash (500 create big balls of several balls: no visial difference with more)
- if (number > 500)
- number = 500;
-
- if (number >= 0 && number <= 0x7FFF) {
- if (sd->spiritball != number || number > 499) {
+ if (number >= 0 && number <= max_spiritballs) {
+ if (sd->spiritball != number) {
if (sd->spiritball > 0)
pc_delspiritball(sd, sd->spiritball, 1);
sd->spiritball = number;
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;