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

edit: Report flags change properly

Browse source 
Print a message, send bulletin to owner.  Affects ship key 'W', land
unit key 'W', and plane key 'f'.  The message is necessary to give the
deity a chance to catch unexpected changes, e.g. a player modifying
retreat conditions right before the deity edits them.  Watching out
for such changes is especially important with non-interactive edit.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-02-03 15:10:46 +01:00
parent ef2e2d08a2
commit 4aa2f071ba
5 changed files with 86 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/commands/edit.c
View file

@ -844,6 +844,8 @@ edit_ship(struct shpstr *ship, char *key, char *p)
strncpy(ship->shp_rpath, p, sizeof(ship->shp_rpath) - 1);
break;
case 'W':
divine_flag_change((struct empobj *)ship, "Retreat conditions",
ship->shp_rflags, arg, retreat_flags);
ship->shp_rflags = arg;
break;
case 'c':
@ -938,6 +940,8 @@ edit_land(struct lndstr *land, char *key, char *p)
strncpy(land->lnd_rpath, p, sizeof(land->lnd_rpath) - 1);
break;
case 'W':
divine_flag_change((struct empobj *)land, "Retreat condition",
land->lnd_rflags, arg, retreat_flags);
land->lnd_rflags = arg;
break;
case 'c':
@ -1025,6 +1029,8 @@ edit_plane(struct plnstr *plane, char *key, char *p)
plane->pln_land = arg;
break;
case 'f':
divine_flag_change((struct empobj *)plane, "Flags",
plane->pln_flags, arg, plane_flags);
plane->pln_flags = arg;
break;
default:

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

@ -175,6 +175,61 @@ divine_unload(struct empobj *unit, int type, int uid)
divine_load_unload(unit, type, uid, "unloaded from");
}
static int
fmtflags (char *buf, size_t sz, int flags, struct symbol symtab[], int all)
{
char *sep = "";
int n, i;
char *p;
if (sz)
buf[0] = 0;
n = 0;
for (i = 0; i < 32; i++) {
if (!(flags & bit(i)))
continue;
p = symbol_by_value(bit(i), symtab);
if (p)
n += snprintf(buf + n, sz - n, "%s%s", sep, p);
else if (all)
n += snprintf(buf + n, sz - n, "%s#%d", sep, i);
if (CANT_HAPPEN((size_t)n >= sz)) {
buf = NULL;
sz = n;
}
sep = ", ";
}
return n;
}
void
divine_flag_change(struct empobj *unit, char *name,
int old, int new, struct symbol sym[])
{
char set[1024], clr[1024];
if (new == old) {
pr("%s of %s unchanged\n", name, unit_nameof(unit));
return;
}
fmtflags(set, sizeof(set), new & ~old, sym, 1);
fmtflags(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 (fmtflags(set, sizeof(set), new & ~old, sym, 0)
+ fmtflags(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" : "",
set[0] && clr[0] ? " and " : "",
clr, clr[0] ? " cleared" : "");
}
/*
* Report deity giving/taking commodities to/from WHOM.
* Give AMT of IP in PLACE.