diff options
| author | Haru <haru@dotalux.com> | 2015-06-02 02:23:24 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-06-02 02:23:24 +0200 |
| commit | 60e499282e124cd8978a32bb84d4b394811f29dc (patch) | |
| tree | 1b3211a6e39e1dacfe9bdfe80b0a798a48ddaecf /src/map/pc.c | |
| parent | d66cc50af6d781d179f46ae67d74bf26bf5914e5 (diff) | |
| parent | 3b4362cd0148a0cabf37306eccf1abbff0edc360 (diff) | |
| download | hercules-60e499282e124cd8978a32bb84d4b394811f29dc.tar.gz hercules-60e499282e124cd8978a32bb84d4b394811f29dc.tar.bz2 hercules-60e499282e124cd8978a32bb84d4b394811f29dc.tar.xz hercules-60e499282e124cd8978a32bb84d4b394811f29dc.zip | |
Merge remote-tracking branch 'upstream/pr/530' into hercules
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index d105edfda..81a0df1c9 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] ) |