From e5f9175394ba245c9d3045bcd829b4f99120de5b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 5 Jan 2006 15:36:49 +0000 Subject: [PATCH] (repo_header, repo_list): HIDDEN used to suppress column status. Don't; report status with less detail for HIDDEN instead, like the country command. --- info/Hidden.t | 2 +- src/lib/commands/repo.c | 24 ++++++++---------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/info/Hidden.t b/info/Hidden.t index 5b923dc4..c8ca1b53 100644 --- a/info/Hidden.t +++ b/info/Hidden.t @@ -10,7 +10,7 @@ country: Discloses less detailed status of active countries. newspaper: Reports on contacted countries only, except for headlines. power: Displays your own power only; other nations never show up. relations: Reports on contacted countries only. -report: Reports on contacted countries only, and no status. +report: Reports on contacted countries only, and less status. .FI .s1 Commands to interact with other countries, like telegram, work only diff --git a/src/lib/commands/repo.c b/src/lib/commands/repo.c index 37b98b53..3cd2f1cb 100644 --- a/src/lib/commands/repo.c +++ b/src/lib/commands/repo.c @@ -112,12 +112,8 @@ repo_header(void) pr(" # name tech research education happiness "); if (player->god) pr("capital\n"); - else { - if (opt_HIDDEN) - pr("\n"); - else - pr(" status\n"); - } + else + pr(" status\n"); } static void @@ -138,16 +134,12 @@ repo_list(struct stats *stat, natid cn, struct natstr *natp) printdiff(stat->stat, stat->res, natp, NAT_RLEV); printdiff(stat->stat, stat->edu, natp, NAT_ELEV); printdiff(stat->stat, stat->hap, natp, NAT_HLEV); - if (opt_HIDDEN) { - pr("\n"); - } else { - if (influx(natp)) - pr("In flux\n"); - else if (natp->nat_money <= 0) - pr("Broke\n"); - else - pr("Active\n"); - } + if (!opt_HIDDEN && influx(natp)) + pr("In flux\n"); + else if (!opt_HIDDEN && natp->nat_money <= 0) + pr("Broke\n"); + else + pr("Active\n"); } }