diff options
| author | Haru <haru@dotalux.com> | 2017-05-27 19:24:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 19:24:42 +0200 |
| commit | cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2 (patch) | |
| tree | 1b1df55f4143bae6bed85093f3424b6af11e4a01 /src/map/itemdb.c | |
| parent | be118c7fad6df29dc691452ef511ac12fea37a06 (diff) | |
| parent | d966a8e6860d418bb3a235e57928436127eba555 (diff) | |
| download | hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.tar.gz hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.tar.bz2 hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.tar.xz hercules-cb3e2f5f3b91d0a1f7711eff9c10ae9a655a74f2.zip | |
Merge pull request #1722 from Smokexyz/mmo_charstatus-fix
Dismemberment of `storage_data` from `mmo_charstatus`.
Diffstat (limited to 'src/map/itemdb.c')
| -rw-r--r-- | src/map/itemdb.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 4076e295c..9a43bae14 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -2490,16 +2490,20 @@ void itemdb_reload(void) { for (sd = BL_UCAST(BL_PC, mapit->first(iter)); mapit->exists(iter); sd = BL_UCAST(BL_PC, mapit->next(iter))) { memset(sd->item_delay, 0, sizeof(sd->item_delay)); // reset item delays pc->setinventorydata(sd); - if( battle_config.item_check ) - sd->state.itemcheck = 1; + + if (battle->bc->item_check != PCCHECKITEM_NONE) // Check and flag items for inspection. + sd->itemcheck = (enum pc_checkitem_types) battle->bc->item_check; + /* clear combo bonuses */ - if( sd->combo_count ) { + if (sd->combo_count) { aFree(sd->combos); sd->combos = NULL; sd->combo_count = 0; if( pc->load_combo(sd) > 0 ) status_calc_pc(sd,SCO_FORCE); } + + // Check for and delete unavailable/disabled items. pc->checkitem(sd); } mapit->free(iter); |