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

(tchrstr, tchr_ca): Remove, use struct symbol and symbol_ca. Users

Browse source 
changed.
(tchr, treaty_flags): Rename for consistency with other flags.
This commit is contained in:
Markus Armbruster 2005-10-29 14:10:23 +00:00
parent 02ec5df820
commit e612db5cb6
7 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/commands/offe.c
View file

@ -81,7 +81,7 @@ do_treaty(void)
register int ourcond;
register int theircond;
register int j;
struct tchrstr *tcp;
struct symbol *tfp;
struct trtstr trty;
struct nstr_item nstr;
natid recipient;
@ -105,21 +105,21 @@ do_treaty(void)
}
pr("Terms for %s:\n", cname(recipient));
theircond = 0;
for (tcp = tchr; tcp && tcp->t_cond; tcp++) {
sprintf(prompt, "%s? ", tcp->t_name);
for (tfp = treaty_flags; tfp && tfp->name; tfp++) {
sprintf(prompt, "%s? ", tfp->name);
if ((cp = getstring(prompt, buf)) == 0)
return RET_FAIL;
if (*cp == 'y')
theircond |= tcp->t_cond;
theircond |= tfp->value;
}
pr("Terms for you:\n");
ourcond = 0;
for (tcp = tchr; tcp && tcp->t_cond; tcp++) {
sprintf(prompt, "%s? ", tcp->t_name);
for (tfp = treaty_flags; tfp && tfp->name; tfp++) {
sprintf(prompt, "%s? ", tfp->name);
if ((cp = getstring(prompt, buf)) == 0)
return RET_FAIL;
if (*cp == 'y')
ourcond |= tcp->t_cond;
ourcond |= tfp->value;
}
if (ourcond == 0 && theircond == 0) {
pr("Treaties with no clauses aren't very useful, boss!\n");