Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-04-06 04:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename action_desc to main_desc

Browse source
This commit is contained in:
kinther 2025-09-07 16:11:05 -07:00
parent 7fafc7f6ea
commit 648085d41f
15 changed files with 123 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/spell_parser.c
View file

@ -318,8 +318,8 @@ void mag_objectmagic(struct char_data *ch, struct obj_data *obj, char *argument)
switch (GET_OBJ_TYPE(obj)) {
case ITEM_STAFF:
act("You tap $p three times on the ground.", FALSE, ch, obj, 0, TO_CHAR);
if (obj->action_description)
act(obj->action_description, FALSE, ch, obj, 0, TO_ROOM);
if (obj->main_description)
act(obj->main_description, FALSE, ch, obj, 0, TO_ROOM);
else
act("$n taps $p three times on the ground.", FALSE, ch, obj, 0, TO_ROOM);
@ -356,15 +356,15 @@ void mag_objectmagic(struct char_data *ch, struct obj_data *obj, char *argument)
act("$n points $p at $mself.", FALSE, ch, obj, 0, TO_ROOM);
} else {
act("You point $p at $N.", FALSE, ch, obj, tch, TO_CHAR);
if (obj->action_description)
act(obj->action_description, FALSE, ch, obj, tch, TO_ROOM);
if (obj->main_description)
act(obj->main_description, FALSE, ch, obj, tch, TO_ROOM);
else
act("$n points $p at $N.", TRUE, ch, obj, tch, TO_ROOM);
}
} else if (tobj != NULL) {
act("You point $p at $P.", FALSE, ch, obj, tobj, TO_CHAR);
if (obj->action_description)
act(obj->action_description, FALSE, ch, obj, tobj, TO_ROOM);
if (obj->main_description)
act(obj->main_description, FALSE, ch, obj, tobj, TO_ROOM);
else
act("$n points $p at $P.", TRUE, ch, obj, tobj, TO_ROOM);
} else if (IS_SET(spell_info[GET_OBJ_VAL(obj, 3)].routines,
@ -402,8 +402,8 @@ void mag_objectmagic(struct char_data *ch, struct obj_data *obj, char *argument)
tch = ch;
act("You recite $p which dissolves.", TRUE, ch, obj, 0, TO_CHAR);
if (obj->action_description)
act(obj->action_description, FALSE, ch, obj, tch, TO_ROOM);
if (obj->main_description)
act(obj->main_description, FALSE, ch, obj, tch, TO_ROOM);
else
act("$n recites $p.", FALSE, ch, obj, NULL, TO_ROOM);
@ -423,8 +423,8 @@ void mag_objectmagic(struct char_data *ch, struct obj_data *obj, char *argument)
return;
act("You quaff $p.", FALSE, ch, obj, NULL, TO_CHAR);
if (obj->action_description)
act(obj->action_description, FALSE, ch, obj, NULL, TO_ROOM);
if (obj->main_description)
act(obj->main_description, FALSE, ch, obj, NULL, TO_ROOM);
else
act("$n quaffs $p.", TRUE, ch, obj, NULL, TO_ROOM);