crossfire
/
server-1.12
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow god-given items to be placed in containers

master
kts of kettek (nyaa) 2018-06-30 20:48:34 -07:00
parent 4ea30c22d0
commit 15dc8e0d15
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/c_object.c
View File

@ -722,15 +722,15 @@ void put_object_in_sack(object *op, object *sack, object *tmp, uint32 nrof) {
name_sack); name_sack);
return; return;
} }
/* Changed to allow god-given materials to be placed into a cauldron -kts */ /* Disabled, as I see no real problem with allowing god-given items to be inserted into containers -kts */
if (QUERY_FLAG(tmp, FLAG_STARTEQUIP) && !QUERY_FLAG(tmp, FLAG_IS_CAULDRON)) { /*if (QUERY_FLAG(tmp, FLAG_STARTEQUIP)) {
query_name(tmp, name_tmp, MAX_BUF); query_name(tmp, name_tmp, MAX_BUF);
draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_ERROR, draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_ERROR,
"You cannot put the %s in the %s.", "You cannot put the %s in the %s.",
"You cannot put the %s in the %s.", "You cannot put the %s in the %s.",
name_tmp, name_sack); name_tmp, name_sack);
return; return;
} }*/
if (tmp->type == CONTAINER) { if (tmp->type == CONTAINER) {
if (tmp->inv) { if (tmp->inv) {
if (tmp->slaying) if (tmp->slaying)