From 3b4362cd0148a0cabf37306eccf1abbff0edc360 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 1 Jun 2015 19:21:00 +0200 Subject: Followup in malufett's commit a5a8605 --- src/map/pc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/map/pc.c b/src/map/pc.c index b2dd11581..06a343714 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -181,8 +181,12 @@ int pc_spiritball_timer(int tid, int64 tick, int id, intptr_t data) { * @retval total number of spiritball **/ int pc_getmaxspiritball(struct map_session_data *sd, int min) { + int result; + nullpo_ret(sd); - int result = pc->checkskill(sd, MO_CALLSPIRITS); + + result = pc->checkskill(sd, MO_CALLSPIRITS); + if ( min && result < min ) result = min; else if ( sd->sc.data[SC_RAISINGDRAGON] ) -- cgit v1.2.3-60-g2f50