empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

symbol: New symbol_set_fmt() parameter sep, use for show

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-10 08:39:48 +01:00
parent 9fc0719e54
commit e92a522731
4 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/subs/actofgod.c
View file

@ -214,16 +214,16 @@ divine_flag_change(struct empobj *unit, char *name,
return;
}
symbol_set_fmt(set, sizeof(set), new & ~old, sym, 1);
symbol_set_fmt(clr, sizeof(clr), old & ~new, sym, 1);
symbol_set_fmt(set, sizeof(set), new & ~old, sym, ", ", 1);
symbol_set_fmt(clr, sizeof(clr), old & ~new, sym, ", ", 1);
pr("%s of %s changed: %s%s%s%s%s\n",
name, unit_nameof(unit),
set, set[0] ? " set" : "",
set[0] && clr[0] ? ", and " : "",
clr, clr[0] ? " cleared" : "");
if (symbol_set_fmt(set, sizeof(set), new & ~old, sym, 0)
+ symbol_set_fmt(clr, sizeof(clr), old & ~new, sym, 0))
if (symbol_set_fmt(set, sizeof(set), new & ~old, sym, ", ", 0)
+ symbol_set_fmt(clr, sizeof(clr), old & ~new, sym, ", ", 0))
wu(0, unit->own, "%s of %s changed by an act of %s: %s%s%s%s%s\n",
name, unit_nameof(unit), cname(player->cnum),
set, set[0] ? " set" : "",