diff options
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/script.c | 5 | ||||
-rw-r--r-- | src/map/script.h | 9 | ||||
-rw-r--r-- | src/map/skill.c | 2 | ||||
-rw-r--r-- | src/map/unit.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/map/script.c b/src/map/script.c index c9839a952..68828db85 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2067,11 +2067,6 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o return code; } -// -// Script state -// -enum {RUN = 0,STOP,END,RERUNLINE,GOTO,RETFUNC}; - /// Returns the player attached to this script, identified by the rid. /// If there is no player attached, the script is terminated. TBL_PC *script_rid2sd(struct script_state *st) diff --git a/src/map/script.h b/src/map/script.h index 981c5b985..d4225d8f8 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -90,10 +90,17 @@ struct script_stack { struct linkdb_node **var_function; // 関数依存変数 }; + +// +// Script state +// +enum e_script_state { RUN,STOP,END,RERUNLINE,GOTO,RETFUNC }; + struct script_state { struct script_stack* stack; int start,end; - int pos,state; + int pos; + enum e_script_state state; int rid,oid; struct script_code *script, *scriptroot; struct sleep_data { diff --git a/src/map/skill.c b/src/map/skill.c index e0dddd1f3..8e5b64b64 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -10220,7 +10220,7 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in if(battle_config.wp_rate != 100) make_per = make_per * battle_config.wp_rate / 100; } -// - Baby Class Penalty = 80% (from adult's chance) ----// + if (sd->class_&JOBL_BABY) //if it's a Baby Class make_per = (make_per * 70) / 100; //Baby penalty is 30% diff --git a/src/map/unit.c b/src/map/unit.c index e52d60782..521907c99 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1870,7 +1870,7 @@ int unit_free(struct block_list *bl, int clrtype) //Tell the script to end, not delete it, it will free itself when necessary [Kevin] if (sd->st) { sd->st->rid = 0; - sd->st->state = 2; + sd->st->state = END; } } else if( bl->type == BL_PET ) { struct pet_data *pd = (struct pet_data*)bl; |