kyonshi/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-02-25 13:01:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved object take check --Rumble

Browse Source
This commit is contained in:
Rumble
2012-09-12 00:42:44 +00:00
parent 30f241d4c7
commit 9f923bae24
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/act.item.c
View File

@@ -161,19 +161,21 @@ ACMD(do_put)
static int can_take_obj(struct char_data *ch, struct obj_data *obj) static int can_take_obj(struct char_data *ch, struct obj_data *obj)
{ {
if (!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) { if (!(CAN_WEAR(obj, ITEM_WEAR_TAKE))) {
if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch)) { act("$p: you can't take that!", FALSE, ch, obj, 0, TO_CHAR);
act("$p: you can't carry that many items.", FALSE, ch, obj, 0, TO_CHAR); return (0);
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 (!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)){ if (OBJ_SAT_IN_BY(obj)){
act("It appears someone is sitting on $p..", FALSE, ch, obj, 0, TO_CHAR); act("It appears someone is sitting on $p..", FALSE, ch, obj, 0, TO_CHAR);
return (0); return (0);