(budg): Create the capital/city name from the d_name field instead of

[empserver] / src / lib / commands / budg.c

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index 406bb34fd3c34352638acc6fc47ac1ac9e2ee459..d4d0bdc911ef636365750ec7219f50da774d5064 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -181,13 +181,13 @@ budg(void)
        expenses -= mil;
     }
     if (p_sect[SCT_CAPIT][0]) {
+       sprintf(in, "%s maintenance\t\t", dchr[SCT_CAPIT].d_name);
+       in[0] = toupper(in[0]);
+       pr(in);
        n = p_sect[SCT_CAPIT][0];
-       sprintf(in, "%d %s%s",
-               n,
-               opt_BIG_CITY ? "cit" : "capital",
-               opt_BIG_CITY ? iesplur(n) : splur(n));
-       pr("%s maintenance\t\t%-32s%8ld\n",
-          opt_BIG_CITY ? "City" : "Capital", in, p_sect[SCT_CAPIT][1]);
+       sprintf(in, "%d %s", n, dchr[SCT_CAPIT].d_name);
+       plurize(in, sizeof(in), n);
+       pr("%-32s%8ld\n", in, p_sect[SCT_CAPIT][1]);
        expenses += p_sect[SCT_CAPIT][1];
     }
     pr("Total expenses%s\n", dotsprintf(buf, "%58d", expenses));