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

assault attack paradrop: Fix inconsistent support formatting

Browse source 
With offensive support but no defensive support, there's no empty line
separating the support table from the text that follows.  Fix that.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-11 13:52:27 +01:00
parent c8e5b4fc50
commit 7be7ad98aa
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Ken Stevens, 1995 * Ken Stevens, 1995
* Steve McClure, 1996-2000 * Steve McClure, 1996-2000
* Markus Armbruster, 2006-2014 * Markus Armbruster, 2006-2015
*/ */
#include <config.h> #include <config.h>
@ -1590,7 +1590,7 @@ get_dsupport(char *outs, struct emp_qelem *list, struct combat *def,
if (good) if (good)
*outs = '\0'; *outs = '\0';
else else
sprintf(outs, "defender\t%1.2f\t%1.2f\t%1.2f\t%1.2f\n\n", df, ds, sprintf(outs, "defender\t%1.2f\t%1.2f\t%1.2f\t%1.2f\n", df, ds,
du, dp); du, dp);
if (def->own) { if (def->own) {
if (good < 0) if (good < 0)
@ -1678,6 +1678,7 @@ att_get_support(int combat_mode, int ofort, int oship, int oland,
pr("%s", osupports); pr("%s", osupports);
if (*dsupportp != 1.0) if (*dsupportp != 1.0)
pr("%s", dsupports); pr("%s", dsupports);
pr("\n");
if (def->own) { if (def->own) {
wu(0, def->own, "\n\t\tsupport values\n"); wu(0, def->own, "\n\t\tsupport values\n");
wu(0, def->own, "\t\tforts\tships\tunits\tplanes\n"); wu(0, def->own, "\t\tforts\tships\tunits\tplanes\n");
@ -1685,6 +1686,7 @@ att_get_support(int combat_mode, int ofort, int oship, int oland,
wu(0, def->own, "%s", osupports); wu(0, def->own, "%s", osupports);
if (*dsupportp != 1.0) if (*dsupportp != 1.0)
wu(0, def->own, "%s", dsupports); wu(0, def->own, "%s", dsupports);
wu(0, def->own, "\n");
} }
} }

2
tests/smoke/journal.log
View file

@ -14582,6 +14582,7 @@
Play#1 output Play#1 1 support values Play#1 output Play#1 1 support values
Play#1 output Play#1 1 forts ships units planes Play#1 output Play#1 1 forts ships units planes
Play#1 output Play#1 1 attacker 0.00 0.00 0.41 0.26 Play#1 output Play#1 1 attacker 0.00 0.00 0.41 0.26
Play#1 output Play#1 1
Play#1 output Play#1 1 Final attack strength: 12 Play#1 output Play#1 1 Final attack strength: 12
Play#1 output Play#1 1 Final defense strength: 187 Play#1 output Play#1 1 Final defense strength: 187
Play#1 output Play#1 1 Final odds: 6% Play#1 output Play#1 1 Final odds: 6%
@ -15044,6 +15045,7 @@
Play#8 output Play#8 1 support values Play#8 output Play#8 1 support values
Play#8 output Play#8 1 forts ships units planes Play#8 output Play#8 1 forts ships units planes
Play#8 output Play#8 1 attacker 0.00 0.00 0.41 0.26 Play#8 output Play#8 1 attacker 0.00 0.00 0.41 0.26
Play#8 output Play#8 1
Play#8 output Play#8 1 1 (#1) lost 6 troops attacking -6,-4 Play#8 output Play#8 1 1 (#1) lost 6 troops attacking -6,-4
Play#8 output Play#8 1 We lost 0 troops defending Play#8 output Play#8 1 We lost 0 troops defending
Play#8 output Play#8 1 Play#8 output Play#8 1