Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-01-04 16:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'refs/heads/master' into feature/cmake

Browse source
This commit is contained in:
Thomas Arp 2025-05-28 23:08:57 +02:00
commit a2e6fe31b6
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/act.item.c
View file

@ -785,6 +785,9 @@ void name_from_drinkcon(struct obj_data *obj)
if (!obj || (GET_OBJ_TYPE(obj) != ITEM_DRINKCON && GET_OBJ_TYPE(obj) != ITEM_FOUNTAIN))
return;
if (obj->name == obj_proto[GET_OBJ_RNUM(obj)].name)
obj->name = strdup(obj_proto[GET_OBJ_RNUM(obj)].name);
liqname = drinknames[GET_OBJ_VAL(obj, 2)];
remove_from_string(obj->name, liqname);