From b9f5bca9b1c6e6ded1e27d95ae8946bbf546c601 Mon Sep 17 00:00:00 2001 From: Cydh Ramdh Date: Fri, 16 Jan 2015 23:38:00 +0700 Subject: [PATCH] Follow up fa75733cc109f926b1df4156ccdf1292c78f8f79 typos Signed-off-by: Cydh Ramdh --- src/map/map.c | 4 ++-- src/map/pc.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/map/map.c b/src/map/map.c index 37cd783faf..51605b2ac4 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1813,8 +1813,8 @@ int map_quit(struct map_session_data *sd) { for (i = 0; i < EQI_MAX; i++) { if (sd->equip_index[i] >= 0) - if (pc_isequip(sd,sd->equip_index[i]) != ITEM_EQUIP_ACK_OK) - pc_unequipitem(sd,sd->equip_index[i],ITEM_EQUIP_ACK_FAIL); + if (pc_isequip(sd,sd->equip_index[i])) + pc_unequipitem(sd,sd->equip_index[i],2); } // Return loot to owner diff --git a/src/map/pc.c b/src/map/pc.c index 7bba12728b..2371f7afa6 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -998,7 +998,7 @@ static bool pc_isItemClass (struct map_session_data *sd, struct item_data* item) * Checks if the player can equip the item at index n in inventory. * @param sd * @param n Item index in inventory - * @return ITEM_EQUIP_ACK_OK if can be equipped, or ITEM_EQUIP_ACK_FAIL/ITEM_EQUIP_ACK_FAILLEVEL if can't + * @return ITEM_EQUIP_ACK_OK(0) if can be equipped, or ITEM_EQUIP_ACK_FAIL(1)/ITEM_EQUIP_ACK_FAILLEVEL(2) if can't *------------------------------------------------*/ uint8 pc_isequip(struct map_session_data *sd,int n) { @@ -5202,8 +5202,8 @@ char pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int } for( i = 0; i < EQI_MAX; i++ ) { if( sd->equip_index[i] >= 0 ) - if( pc_isequip(sd,sd->equip_index[i]) != ITEM_EQUIP_ACK_OK ) - pc_unequipitem(sd,sd->equip_index[i],ITEM_EQUIP_ACK_FAIL ); + if( pc_isequip(sd,sd->equip_index[i]) ) + pc_unequipitem(sd,sd->equip_index[i],2); } if (battle_config.clear_unit_onwarp&BL_PC) skill_clear_unitgroup(&sd->bl); @@ -6811,8 +6811,8 @@ int pc_resetlvl(struct map_session_data* sd,int type) for(i=0;iequip_index[i] >= 0) - if(pc_isequip(sd,sd->equip_index[i]) != ITEM_EQUIP_ACK_OK) - pc_unequipitem(sd,sd->equip_index[i],ITEM_EQUIP_ACK_FAILLEVEL); + if(pc_isequip(sd,sd->equip_index[i])) + pc_unequipitem(sd,sd->equip_index[i],2); } if ((type == 1 || type == 2 || type == 3) && sd->status.party_id) @@ -8088,8 +8088,8 @@ bool pc_jobchange(struct map_session_data *sd,int job, char upper) for(i=0;iequip_index[i] >= 0) - if(pc_isequip(sd,sd->equip_index[i]) != ITEM_EQUIP_ACK_OK) - pc_unequipitem(sd,sd->equip_index[i],ITEM_EQUIP_ACK_FAILLEVEL); // unequip invalid item for class + if(pc_isequip(sd,sd->equip_index[i])) + pc_unequipitem(sd,sd->equip_index[i],2); // unequip invalid item for class } //Change look, if disguised, you need to undisguise @@ -9149,7 +9149,7 @@ bool pc_equipitem(struct map_session_data *sd,short n,int req_pos) if(battle_config.battle_log) ShowInfo("equip %hu(%d) %x:%x\n",sd->status.inventory[n].nameid,n,id?id->equip:0,req_pos); - if((res = pc_isequip(sd,n)) != ITEM_EQUIP_ACK_OK) { + if((res = pc_isequip(sd,n))) { clif_equipitemack(sd,n,0,res); // fail return false; }