summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 94ffc403e..5b401d87f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2507,7 +2507,16 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
return 1;
}
}
-
+
+ /* we've got combos to process */
+ if( sd->combos.count ) {
+ for( i = 0; i < sd->combos.count; i++ ) {
+ run_script(sd->combos.bonus[i],0,sd->bl.id,0);
+ if (!calculating) //Abort, run_script retriggered this.
+ return 1;
+ }
+ }
+
//Store equipment script bonuses
memcpy(sd->param_equip,sd->param_bonus,sizeof(sd->param_equip));
memset(sd->param_bonus, 0, sizeof(sd->param_bonus));