From 0ffbc20fd41a45cf8ac5649d561329de2ef3b79b Mon Sep 17 00:00:00 2001 From: Cydh Ramdh Date: Thu, 7 Jan 2016 06:18:38 +0700 Subject: [PATCH] Follow up c699304bd95b5c3bf9dddcca1dd2fe842169c650, removed redundant check. Thank @Lemongrass3110 Signed-off-by: Cydh Ramdh --- src/map/pc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/pc.c b/src/map/pc.c index 604c803fbf..962d37ba6e 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -9306,7 +9306,7 @@ bool pc_equipitem(struct map_session_data *sd,short n,int req_pos) return false; } - if ((sd->class_&MAPID_BASEMASK) == MAPID_GUNSLINGER && (id->type == IT_AMMO || (id->type == IT_WEAPON && id->look >= W_REVOLVER && id->look <= W_GRENADE))) { + if ((sd->class_&MAPID_BASEMASK) == MAPID_GUNSLINGER) { /** Failing condition: * 1. Always failed to equip ammo if no weapon equipped yet * 2. Grenade only can be equipped if weapon is Grenade Launcher @@ -9324,7 +9324,7 @@ bool pc_equipitem(struct map_session_data *sd,short n,int req_pos) return false; } } - else { + else if (id->type == IT_WEAPON && id->look >= W_REVOLVER && id->look <= W_GRENADE) { int a_idx = sd->equip_index[EQI_AMMO]; if (a_idx != -1) { enum ammo_type a_type = (enum ammo_type)sd->inventory_data[a_idx]->look;