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

Added send_cannot_edit, removed LVL_FREEZE, and fixed fight_messages. --Rumble

Browse Source
This commit is contained in:
Rumble
2007-03-04 20:18:13 +00:00
parent f2bb44ceb1
commit 42377c319a
37 changed files with 6212 additions and 7018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/act.item.c
View File

@@ -462,9 +462,10 @@ int perform_drop(struct char_data *ch, struct obj_data *obj,
if ((mode == SCMD_DROP) && !drop_wtrigger(obj, ch))
return 0;
if (OBJ_FLAGGED(obj, ITEM_NODROP)) {
if (OBJ_FLAGGED(obj, ITEM_NODROP) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
snprintf(buf, sizeof(buf), "You can't %s $p, it must be CURSED!", sname);
act(buf, FALSE, ch, obj, 0, TO_CHAR);
return (0);
}
snprintf(buf, sizeof(buf), "You %s $p.%s", sname, VANISH(mode));
@@ -1166,8 +1167,6 @@ ACMD(do_pour)
weight_change_object(to_obj, amount); /* Add weight */
}
void wear_message(struct char_data *ch, struct obj_data *obj, int where)
{
const char *wear_messages[][2] = {
@@ -1230,8 +1229,6 @@ void wear_message(struct char_data *ch, struct obj_data *obj, int where)
act(wear_messages[where][1], FALSE, ch, obj, 0, TO_CHAR);
}
void perform_wear(struct char_data *ch, struct obj_data *obj, int where)
{
/*
@@ -1293,8 +1290,6 @@ void perform_wear(struct char_data *ch, struct obj_data *obj, int where)
equip_char(ch, obj, where);
}
int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg)
{
int where = -1;
@@ -1340,8 +1335,6 @@ int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg)
return (where);
}
ACMD(do_wear)
{
char arg1[MAX_INPUT_LENGTH];
@@ -1401,8 +1394,6 @@ ACMD(do_wear)
}
}
ACMD(do_wield)
{
char arg[MAX_INPUT_LENGTH];
@@ -1424,8 +1415,6 @@ ACMD(do_wield)
}
}
ACMD(do_grab)
{
char arg[MAX_INPUT_LENGTH];
@@ -1451,21 +1440,17 @@ ACMD(do_grab)
}
}
void perform_remove(struct char_data *ch, int pos)
{
struct obj_data *obj;
if (!(obj = GET_EQ(ch, pos)))
log("SYSERR: perform_remove: bad pos %d passed.", pos);
/* SYSERR_DESC:
* This error occurs when perform_remove() is passed a bad 'pos'
* (location) to remove an object from.
*/
else if (OBJ_FLAGGED(obj, ITEM_NODROP))
/* This error occurs when perform_remove() is passed a bad 'pos'
* (location) to remove an object from. */
else if (OBJ_FLAGGED(obj, ITEM_NODROP) && !PRF_FLAGGED(ch, PRF_NOHASSLE))
act("You can't remove $p, it must be CURSED!", FALSE, ch, obj, 0, TO_CHAR);
else if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch))
else if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch)&& !PRF_FLAGGED(ch, PRF_NOHASSLE))
act("$p: you can't carry that many items!", FALSE, ch, obj, 0, TO_CHAR);
else {
if (!remove_otrigger(obj, ch))
@@ -1477,8 +1462,6 @@ void perform_remove(struct char_data *ch, int pos)
}
}
ACMD(do_remove)
{
char arg[MAX_INPUT_LENGTH];