Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up bd2503e,7355677 and fef6307. Merged Hercules e115c30

Browse Source
This commit is contained in:
Lilith- 2013-12-16 06:46:21 -08:00
parent 54dfc67925
commit a29aace9c5
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/atcommand.c
View File

@ -2103,9 +2103,10 @@ ACMD_FUNC(refine)
refine = cap_value(refine, -MAX_REFINE, MAX_REFINE); refine = cap_value(refine, -MAX_REFINE, MAX_REFINE);
count = 0; count = 0;
for (j = 0; j < EQI_MAX-1; j++) { for (j = 0; j < EQI_MAX; j++) {
if ((i = sd->equip_index[j]) < 0) if ((i = sd->equip_index[j]) < 0)
continue; continue;
if(j == EQI_AMMO) continue;
if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == i) if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == i)
continue; continue;
if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == i) if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == i)

8
src/map/pc.c
View File

@ -1979,8 +1979,8 @@ int pc_delautobonus(struct map_session_data* sd, struct s_autobonus *autobonus,c
if( autobonus[i].bonus_script ) if( autobonus[i].bonus_script )
{ {
int j; int j;
ARR_FIND( 0, EQI_MAX-1, j, sd->equip_index[j] >= 0 && sd->status.inventory[sd->equip_index[j]].equip == autobonus[i].pos ); ARR_FIND( 0, EQI_MAX, j, sd->equip_index[j] >= 0 && sd->status.inventory[sd->equip_index[j]].equip == autobonus[i].pos );
if( j < EQI_MAX-1 ) if( j < EQI_MAX )
script_run_autobonus(autobonus[i].bonus_script,sd->bl.id,sd->equip_index[j]); script_run_autobonus(autobonus[i].bonus_script,sd->bl.id,sd->equip_index[j]);
} }
continue; continue;
@ -2010,8 +2010,8 @@ int pc_exeautobonus(struct map_session_data *sd,struct s_autobonus *autobonus)
if( autobonus->other_script ) if( autobonus->other_script )
{ {
int j; int j;
ARR_FIND( 0, EQI_MAX-1, j, sd->equip_index[j] >= 0 && sd->status.inventory[sd->equip_index[j]].equip == autobonus->pos ); ARR_FIND( 0, EQI_MAX, j, sd->equip_index[j] >= 0 && sd->status.inventory[sd->equip_index[j]].equip == autobonus->pos );
if( j < EQI_MAX-1 ) if( j < EQI_MAX )
script_run_autobonus(autobonus->other_script,sd->bl.id,sd->equip_index[j]); script_run_autobonus(autobonus->other_script,sd->bl.id,sd->equip_index[j]);
} }

6
src/map/status.c
View File

@ -2587,10 +2587,11 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
pc_delautobonus(sd,sd->autobonus3,ARRAYLENGTH(sd->autobonus3),true); pc_delautobonus(sd,sd->autobonus3,ARRAYLENGTH(sd->autobonus3),true);
// Parse equipment // Parse equipment
for(i=0;i<EQI_MAX-1;i++) { for(i=0;i<EQI_MAX;i++) {
current_equip_item_index = index = sd->equip_index[i]; // We pass INDEX to current_equip_item_index - for EQUIP_SCRIPT (new cards solution) [Lupus] current_equip_item_index = index = sd->equip_index[i]; // We pass INDEX to current_equip_item_index - for EQUIP_SCRIPT (new cards solution) [Lupus]
if(index < 0) if(index < 0)
continue; continue;
if(i == EQI_AMMO) continue;
if(i == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index) if(i == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index)
continue; continue;
if(i == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index) if(i == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index)
@ -2737,10 +2738,11 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
status->def += (refinedef+50)/100; status->def += (refinedef+50)/100;
// Parse Cards // Parse Cards
for(i=0;i<EQI_MAX-1;i++) { for(i=0;i<EQI_MAX;i++) {
current_equip_item_index = index = sd->equip_index[i]; // We pass INDEX to current_equip_item_index - for EQUIP_SCRIPT (new cards solution) [Lupus] current_equip_item_index = index = sd->equip_index[i]; // We pass INDEX to current_equip_item_index - for EQUIP_SCRIPT (new cards solution) [Lupus]
if(index < 0) if(index < 0)
continue; continue;
if(i == EQI_AMMO) continue;
if(i == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index) if(i == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index)
continue; continue;
if(i == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index) if(i == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index)