Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrong comment for 'countspiritball'

Browse Source 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
This commit is contained in:
Cydh Ramdh 2013-12-06 16:52:20 +07:00
parent 84b5dbfb7e
commit 423fa17075
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/map/script.c
View File

@ -18177,7 +18177,10 @@ BUILDIN_FUNC(bonus_script) {
BUILDIN_FUNC(addspiritball) { BUILDIN_FUNC(addspiritball) {
uint8 i, amount = script_getnum(st,2); uint8 i, amount = script_getnum(st,2);
uint16 tick = script_getnum(st,3); uint16 tick = script_getnum(st,3);
struct map_session_data *sd; struct map_session_data *sd = NULL;
if (amount == 0)
return SCRIPT_CMD_SUCCESS;
if (script_getnum(st,4)) if (script_getnum(st,4))
sd = map_charid2sd(script_getnum(st,4)); sd = map_charid2sd(script_getnum(st,4));
@ -18186,9 +18189,6 @@ BUILDIN_FUNC(addspiritball) {
if (!sd) if (!sd)
return SCRIPT_CMD_FAILURE; return SCRIPT_CMD_FAILURE;
if (amount == 0)
return SCRIPT_CMD_SUCCESS;
for (i = 0; i < amount; i++) for (i = 0; i < amount; i++)
pc_addspiritball(sd,tick*1000,10); pc_addspiritball(sd,tick*1000,10);
return SCRIPT_CMD_SUCCESS; return SCRIPT_CMD_SUCCESS;
@ -18199,7 +18199,10 @@ BUILDIN_FUNC(addspiritball) {
*/ */
BUILDIN_FUNC(delspiritball) { BUILDIN_FUNC(delspiritball) {
uint8 amount = script_getnum(st,2); uint8 amount = script_getnum(st,2);
struct map_session_data *sd; struct map_session_data *sd = NULL;
if (amount == 0)
return SCRIPT_CMD_SUCCESS;
if (script_getnum(st,3)) if (script_getnum(st,3))
sd = map_charid2sd(script_getnum(st,3)); sd = map_charid2sd(script_getnum(st,3));
@ -18208,14 +18211,12 @@ BUILDIN_FUNC(delspiritball) {
if (!sd) if (!sd)
return SCRIPT_CMD_FAILURE; return SCRIPT_CMD_FAILURE;
if (amount == 0)
return SCRIPT_CMD_SUCCESS;
pc_delspiritball(sd,max(amount,1),1); pc_delspiritball(sd,max(amount,1),1);
return SCRIPT_CMD_SUCCESS; return SCRIPT_CMD_SUCCESS;
} }
/** Counts the spirit ball that player has /** Counts the spirit ball that player has
* delspiritball {,<char_id>}; * countspiritball {,<char_id>};
*/ */
BUILDIN_FUNC(countspiritball) { BUILDIN_FUNC(countspiritball) {
struct map_session_data *sd; struct map_session_data *sd;