diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-14 02:24:49 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-14 02:24:49 +0000 |
| commit | f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7 (patch) | |
| tree | 0f2717916a49ae9e0d24ba041482f15c5118a727 /src/map/script.c | |
| parent | 92c1c98824efb789709d70ee8d6d5ed6e49b47a3 (diff) | |
| parent | 94a8a08118ecd9e358d794d430945ada248d0959 (diff) | |
| download | tmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.tar.gz tmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.tar.bz2 tmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.tar.xz tmwa-f5f588157c209bc90f7c9f14ec4ed1403fdd1ee7.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena/mainline
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/map/script.c b/src/map/script.c index 9378e33..daf6374 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -13,6 +13,7 @@ #endif #include <time.h> +#include <math.h> #include "socket.h" #include "timer.h" @@ -25,6 +26,7 @@ #include "chrif.h" #include "clif.h" #include "db.h" +#include "guild.h" #include "intif.h" #include "itemdb.h" #include "lock.h" @@ -3175,7 +3177,7 @@ int buildin_skill(struct script_state *st) */ int buildin_setskill(struct script_state *st) { - int id,level,flag=1; + int id,level; struct map_session_data *sd; id=conv_num(st,& (st->stack->stack_data[st->start+2])); @@ -3186,6 +3188,7 @@ int buildin_setskill(struct script_state *st) sd->status.skill[id].lv = level; sd->status.skill[id].flag = 0; clif_skillinfoblock(sd); + return 0; } /*========================================== @@ -5535,11 +5538,11 @@ int buildin_misceffect(struct script_state *st) type=conv_num(st,& (st->stack->stack_data[st->start+2])); if(st->oid) - clif_misceffect2(map_id2bl(st->oid),type); + clif_misceffect(map_id2bl(st->oid),type); else{ struct map_session_data *sd=script_rid2sd(st); if(sd) - clif_misceffect2(&sd->bl,type); + clif_misceffect(&sd->bl,type); } return 0; } @@ -5891,7 +5894,6 @@ int buildin_shop(struct script_state *st) { struct map_session_data *sd=script_rid2sd(st); struct npc_data *nd; - char *str; if (!sd) return 1; @@ -5914,6 +5916,7 @@ int buildin_isdead(struct script_state *st) struct map_session_data *sd=script_rid2sd(st); push_val(st->stack, C_INT, pc_isdead(sd)); + return 0; } // @@ -6399,7 +6402,7 @@ int run_script_main(unsigned char *script,int pos,int rid,int oid,struct script_ */ int run_script(unsigned char *script,int pos,int rid,int oid) { - run_script_l(script, pos, rid, oid, 0, NULL); + return run_script_l(script, pos, rid, oid, 0, NULL); } int run_script_l(unsigned char *script,int pos,int rid,int oid, int args_nr, argrec_t *args) |