summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLemongrass3110 <lemongrass@kstp.at>2015-06-01 19:21:00 +0200
committerLemongrass3110 <lemongrass@kstp.at>2015-06-01 19:21:00 +0200
commit3b4362cd0148a0cabf37306eccf1abbff0edc360 (patch)
tree0ccc594df8faa20e91f2e476be1d72ec9d483f47
parent544a75b873a3dbdfa21435a3ab93fea453406a5b (diff)
downloadhercules-3b4362cd0148a0cabf37306eccf1abbff0edc360.tar.gz
hercules-3b4362cd0148a0cabf37306eccf1abbff0edc360.tar.bz2
hercules-3b4362cd0148a0cabf37306eccf1abbff0edc360.tar.xz
hercules-3b4362cd0148a0cabf37306eccf1abbff0edc360.zip
Followup in malufett's commit a5a8605
-rw-r--r--src/map/pc.c6
1 files changed, 5 insertions, 1 deletions
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] )