|
@@ -3464,7 +3464,6 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
|
|
|
|
|
|
if (sd->inventory_data[index]) {
|
|
if (sd->inventory_data[index]) {
|
|
int j;
|
|
int j;
|
|
- struct item_data *itemdata;
|
|
|
|
struct s_random_opt_data *data;
|
|
struct s_random_opt_data *data;
|
|
for (j = 0; j < MAX_ITEM_RDM_OPT; j++) {
|
|
for (j = 0; j < MAX_ITEM_RDM_OPT; j++) {
|
|
short opt_id = sd->status.inventory[index].option[j].id;
|
|
short opt_id = sd->status.inventory[index].option[j].id;
|
|
@@ -3472,11 +3471,10 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
|
|
if (!opt_id)
|
|
if (!opt_id)
|
|
continue;
|
|
continue;
|
|
current_equip_opt_index = j;
|
|
current_equip_opt_index = j;
|
|
- itemdata = itemdb_exists(nameid);
|
|
|
|
data = itemdb_randomopt_exists(opt_id);
|
|
data = itemdb_randomopt_exists(opt_id);
|
|
if (!data || !data->script)
|
|
if (!data || !data->script)
|
|
continue;
|
|
continue;
|
|
- if (!pc_has_permission(sd, PC_PERM_USE_ALL_EQUIPMENT) && itemdb_isNoEquip(itemdata, sd->bl.m))
|
|
|
|
|
|
+ if (!pc_has_permission(sd, PC_PERM_USE_ALL_EQUIPMENT) && itemdb_isNoEquip(sd->inventory_data[index], sd->bl.m))
|
|
continue;
|
|
continue;
|
|
if (i == EQI_HAND_L && sd->status.inventory[index].equip == EQP_HAND_L) { // Left hand status.
|
|
if (i == EQI_HAND_L && sd->status.inventory[index].equip == EQP_HAND_L) { // Left hand status.
|
|
sd->state.lr_flag = 1;
|
|
sd->state.lr_flag = 1;
|