diff options
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/map/status.c b/src/map/status.c index bf48d2301..f2275e47b 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2694,7 +2694,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) int j = 0; for (j = 0; j < MAX_ITEM_OPTIONS; j++) { int16 option_index = sd->status.inventory[index].option[j].index; - struct item_option *ito = NULL; + struct itemdb_option *ito = NULL; if (option_index == 0 || (ito = itemdb->option_exists(option_index)) == NULL || ito->script == NULL) continue; @@ -4985,9 +4985,6 @@ unsigned short status_calc_batk(struct block_list *bl, struct status_change *sc, #ifndef RENEWAL if(sc->data[SC_LKCONCENTRATION]) batk += batk * sc->data[SC_LKCONCENTRATION]->val2/100; -#else - if ( sc->data[SC_NOEQUIPWEAPON] && bl->type != BL_PC ) - batk -= batk * sc->data[SC_NOEQUIPWEAPON]->val2 / 100; #endif if(sc->data[SC_SKE]) batk += batk * 3; @@ -5090,7 +5087,7 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, if(sc->data[SC_LKCONCENTRATION]) watk += watk * sc->data[SC_LKCONCENTRATION]->val2/100; #endif - if(sc->data[SC_INCATKRATE] && bl->type != BL_MOB) + if(sc->data[SC_INCATKRATE]) watk += watk * sc->data[SC_INCATKRATE]->val1/100; if(sc->data[SC_PROVOKE]) watk += watk * sc->data[SC_PROVOKE]->val3/100; @@ -5100,10 +5097,8 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, watk += watk * sc->data[SC_HLIF_FLEET]->val3/100; if(sc->data[SC_CURSE]) watk -= watk * 25/100; -#ifndef RENEWAL if(sc->data[SC_NOEQUIPWEAPON] && bl->type != BL_PC) watk -= watk * sc->data[SC_NOEQUIPWEAPON]->val2/100; -#endif if(sc->data[SC__ENERVATION]) watk -= watk * sc->data[SC__ENERVATION]->val2 / 100; if(sc->data[SC_RUSH_WINDMILL]) @@ -13114,7 +13109,8 @@ void status_read_job_db_sub(int idx, const char *name, struct config_setting_t * pc->dbs->class_exp_table[idx][CLASS_EXP_TABLE_BASE] = &VECTOR_INDEX(pc->class_exp_groups[CLASS_EXP_TABLE_BASE], i); } } else { - ShowError("status_read_job_db: BaseExpGroup setting not found for entry '%s'\n", name); + ShowError("status_read_job_db: BaseExpGroup setting not found for entry '%s', skipping..\n", name); + return; } /** @@ -13129,7 +13125,8 @@ void status_read_job_db_sub(int idx, const char *name, struct config_setting_t * pc->dbs->class_exp_table[idx][CLASS_EXP_TABLE_JOB] = &VECTOR_INDEX(pc->class_exp_groups[CLASS_EXP_TABLE_JOB], i); } } else { - ShowError("status_read_job_db: JobExpGroup setting not found for entry '%s'\n", name); + ShowError("status_read_job_db: JobExpGroup setting not found for entry '%s', skipping..\n", name); + return; } if ((temp = libconfig->setting_get_member(jdb, "Inherit"))) { |