kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug/drink containers (#94)

Browse Source 
* Bugfix for name_from_drinkcon

* Newline at end of utils.c
This commit is contained in:
MBourne
2020-06-07 13:52:22 +01:00
committed by GitHub
parent c0fb6f8a71
commit dceb563a9b
3 changed files with 73 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/act.item.c
View File

@@ -779,50 +779,19 @@ void weight_change_object(struct obj_data *obj, int weight)
void name_from_drinkcon(struct obj_data *obj)
{
char *new_name, *cur_name, *next;
const char *liqname;
int liqlen, cpylen, maxlen;
char *new_name;
if (!obj || (GET_OBJ_TYPE(obj) != ITEM_DRINKCON && GET_OBJ_TYPE(obj) != ITEM_FOUNTAIN))
return;
liqname = drinknames[GET_OBJ_VAL(obj, 2)];
if (!isname(liqname, obj->name)) {
log("SYSERR: Can't remove liquid '%s' from '%s' (%d) item.", liqname, obj->name, obj->item_number);
/* SYSERR_DESC: From name_from_drinkcon(), this error comes about if the
* object noted (by keywords and item vnum) does not contain the liquid
* string being searched for. */
return;
}
liqlen = strlen(liqname);
maxlen = strlen(obj->name) - strlen(liqname); /* +1 for NUL, -1 for space */
CREATE(new_name, char, maxlen);
for (cur_name = obj->name; cur_name; cur_name = next) {
if (*cur_name == ' ')
cur_name++;
if ((next = strchr(cur_name, ' ')))
cpylen = next - cur_name;
else
cpylen = strlen(cur_name);
if (!strn_cmp(cur_name, liqname, liqlen))
continue;
if (*new_name) {
strcat(new_name, " "); /* strcat: OK (size precalculated) */
maxlen--;
}
strncat(new_name, cur_name, maxlen); /* strncat: OK (size precalculated) */
maxlen -= cpylen;
}
if (GET_OBJ_RNUM(obj) == NOTHING || obj->name != obj_proto[GET_OBJ_RNUM(obj)].name)
free(obj->name);
remove_from_string(obj->name, liqname);
new_name = right_trim_whitespace(obj->name);
free(obj->name);
obj->name = new_name;
}
void name_to_drinkcon(struct obj_data *obj, int type)