From 9f923bae247dca6838373095dfd08e74a712e2a8 Mon Sep 17 00:00:00 2001 From: Rumble Date: Wed, 12 Sep 2012 00:42:44 +0000 Subject: [PATCH] Moved object take check --Rumble --- src/act.item.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/act.item.c b/src/act.item.c index 2741acd..00f8433 100644 --- a/src/act.item.c +++ b/src/act.item.c @@ -161,18 +161,20 @@ ACMD(do_put) static int can_take_obj(struct char_data *ch, struct obj_data *obj) { - if (!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) { - if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch)) { - act("$p: you can't carry that many items.", FALSE, ch, obj, 0, TO_CHAR); - return (0); - } else if ((IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj)) > CAN_CARRY_W(ch)) { - act("$p: you can't carry that much weight.", FALSE, ch, obj, 0, TO_CHAR); - return (0); - } else if (!(CAN_WEAR(obj, ITEM_WEAR_TAKE))) { - act("$p: you can't take that!", FALSE, ch, obj, 0, TO_CHAR); - return (0); - } +if (!(CAN_WEAR(obj, ITEM_WEAR_TAKE))) { + act("$p: you can't take that!", FALSE, ch, obj, 0, TO_CHAR); + return (0); } + +if (!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) { + if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch)) { + act("$p: you can't carry that many items.", FALSE, ch, obj, 0, TO_CHAR); + return (0); + } else if ((IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj)) > CAN_CARRY_W(ch)) { + act("$p: you can't carry that much weight.", FALSE, ch, obj, 0, TO_CHAR); + return (0); + } +} if (OBJ_SAT_IN_BY(obj)){ act("It appears someone is sitting on $p..", FALSE, ch, obj, 0, TO_CHAR);