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

Fix long lines. No functional changes.

Browse source
This commit is contained in:
Markus Armbruster 2006-04-17 16:38:43 +00:00
parent e264be1a78
commit 98d35dec3e
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/lib/subs/attsub.c
View file

@ -273,11 +273,12 @@ att_get_combat(struct combat *com, int isdef)
} }
if (owner != com->own) { if (owner != com->own) {
if (owner) { if (owner) {
pr("WARNING: The ownership of %s just changed from %s to %s!\n", prcom(0, com), cname(com->own), cname(owner)); pr("WARNING: The ownership of %s just changed from %s to %s!\n",
prcom(0, com), cname(com->own), cname(owner));
} else if (com->type == EF_SECTOR) { } else if (com->type == EF_SECTOR) {
pr("WARNING: %s just abandoned sector %s!\n", pr("WARNING: %s just abandoned sector %s!\n",
cname(com->own), xyas(com->x, com->y, cname(com->own),
player->cnum)); xyas(com->x, com->y, player->cnum));
} }
} }
if (com->mil != mil) if (com->mil != mil)
@ -287,17 +288,22 @@ att_get_combat(struct combat *com, int isdef)
mil); mil);
com->troops = mil; com->troops = mil;
} else { /* attacker */ } else { /* attacker */
if (owner != player->cnum && getrel(getnatp(owner), player->cnum) != ALLIED) { /* must be EF_SECTOR */ if (owner != player->cnum && getrel(getnatp(owner), player->cnum) != ALLIED) {
/* must be EF_SECTOR */
if (com->mil) if (com->mil)
pr("WARNING: Your %d mil in %s were destroyed because %s just took the sector!\n", com->mil, xyas(com->x, com->y, player->cnum), cname(owner)); pr("WARNING: Your %d mil in %s were destroyed because %s just took the sector!\n",
com->mil, xyas(com->x, com->y, player->cnum),
cname(owner));
else else
pr("You no longer own %s\n", pr("You no longer own %s\n",
xyas(com->x, com->y, player->cnum)); xyas(com->x, com->y, player->cnum));
return att_combat_init(com, EF_BAD); return att_combat_init(com, EF_BAD);
} }
if (com->troops && com->troops + 1 > mil) { if (com->troops && com->troops + 1 > mil) {
if (com->own == owner && player->cnum == owner) /* not a takeover */ if (com->own == owner && player->cnum == owner)
pr("WARNING: Your mil %s has been reduced from %d to %d!\n", prcom(1, com), com->troops, MAX(0, mil - 1)); /* not a takeover */
pr("WARNING: Your mil %s has been reduced from %d to %d!\n",
prcom(1, com), com->troops, MAX(0, mil - 1));
com->troops = MAX(0, mil - 1); com->troops = MAX(0, mil - 1);
} }
} }
@ -927,7 +933,13 @@ att_prompt(s_char *prompt, s_char army)
if (!p || !*p) if (!p || !*p)
return 'n'; return 'n';
if (p && *p != -2) if (p && *p != -2)
pr("y - yes this unit\nn - no this unit\nY - yes to all units in army '%c'\nN - no to all units in army '%c'\nq - quit\n? - this help message\n\n", army, army); pr("y - yes this unit\n"
"n - no this unit\n"
"Y - yes to all units in army '%c'\n"
"N - no to all units in army '%c'\n"
"q - quit\n"
"? - this help message\n\n",
army, army);
p = getstring(prompt, buf); p = getstring(prompt, buf);
if (player->aborted) { if (player->aborted) {
buf[0] = 'N'; buf[0] = 'N';