diff options
| author | Haru <haru@dotalux.com> | 2016-07-10 16:00:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-10 16:00:25 +0200 |
| commit | 339483ce1356e45c06dafc22a08dcac9b8c639f8 (patch) | |
| tree | 50ca31c098a27a042d7f40bc8031ec479c0689ba /src/map/clif.c | |
| parent | 468ceee02b8c4a0468be577463ee6ef9dc60086b (diff) | |
| parent | 26881acaf4aa3bcc0296d382f333bce57fda82a7 (diff) | |
| download | hercules-339483ce1356e45c06dafc22a08dcac9b8c639f8.tar.gz hercules-339483ce1356e45c06dafc22a08dcac9b8c639f8.tar.bz2 hercules-339483ce1356e45c06dafc22a08dcac9b8c639f8.tar.xz hercules-339483ce1356e45c06dafc22a08dcac9b8c639f8.zip | |
Merge pull request #1350 from 4144/scconf
Extend with new flag sc_config.txt
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 0f6e985fd..9619a7201 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1455,7 +1455,7 @@ bool clif_spawn(struct block_list *bl) if (sd->bg_id != 0 && map->list[sd->bl.m].flag.battleground) clif->sendbgemblem_area(sd); for (i = 0; i < sd->sc_display_count; i++) { - clif->sc_load(&sd->bl, sd->bl.id,AREA,status->dbs->IconChangeTable[sd->sc_display[i]->type],sd->sc_display[i]->val1,sd->sc_display[i]->val2,sd->sc_display[i]->val3); + clif->sc_continue(&sd->bl, sd->bl.id,AREA,status->dbs->IconChangeTable[sd->sc_display[i]->type],sd->sc_display[i]->val1,sd->sc_display[i]->val2,sd->sc_display[i]->val3); } if (sd->charm_type != CHARM_TYPE_NONE && sd->charm_count > 0) clif->spiritcharm(sd); @@ -4186,7 +4186,7 @@ void clif_getareachar_pc(struct map_session_data* sd,struct map_session_data* ds clif->charm_single(sd->fd, dstsd); for( i = 0; i < dstsd->sc_display_count; i++ ) { - clif->sc_load(&sd->bl,dstsd->bl.id,SELF,status->dbs->IconChangeTable[dstsd->sc_display[i]->type],dstsd->sc_display[i]->val1,dstsd->sc_display[i]->val2,dstsd->sc_display[i]->val3); + clif->sc_continue(&sd->bl,dstsd->bl.id,SELF,status->dbs->IconChangeTable[dstsd->sc_display[i]->type],dstsd->sc_display[i]->val1,dstsd->sc_display[i]->val2,dstsd->sc_display[i]->val3); } if( (sd->status.party_id && dstsd->status.party_id == sd->status.party_id) || //Party-mate, or hpdisp setting. (sd->bg_id && sd->bg_id == dstsd->bg_id) || //BattleGround @@ -19319,6 +19319,7 @@ void clif_defaults(void) { clif->autoshadowspell_list = clif_autoshadowspell_list; clif->skill_itemlistwindow = clif_skill_itemlistwindow; clif->sc_load = clif_status_change2; + clif->sc_continue = clif_status_change2; clif->sc_end = clif_status_change_end; clif->initialstatus = clif_initialstatus; clif->cooldown_list = clif_skill_cooldown_list; |