From 6459cfce7b0cde4f4a3f18e878ecdd8233dfac58 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 23 Mar 2009 20:15:31 +0100 Subject: [PATCH] Simplify explain() No functional change. --- src/lib/player/empdis.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index 3c6428893..f25645d2e 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -124,8 +124,7 @@ log_last_commands(void) int explain(void) { - char *format; - int i; + struct cmndstr *com; pr("\t\tCurrent EMPIRE Command List\n" "\t\t------- ------ ------- ----\n" @@ -139,19 +138,18 @@ explain(void) " :: a number in unspecified units\n" " :: a commodity such as `food', `guns', etc\n" " :: an item type such as `ship', `plane', etc\n"); - for (i = 0; (format = player_coms[i].c_form) != 0; i++) { - if ((player_coms[i].c_permit & player->nstat) - == player_coms[i].c_permit) { - pr("%2d ", player_coms[i].c_cost); - if ((player_coms[i].c_permit & MONEY) == MONEY) + for (com = player_coms; com->c_form; com++) { + if ((com->c_permit & player->nstat) == com->c_permit) { + pr("%2d ", com->c_cost); + if (com->c_permit & MONEY) pr("$"); else pr(" "); - if ((player_coms[i].c_permit & CAP) == CAP) + if (com->c_permit & CAP) pr("c"); else pr(" "); - pr(" %s\n", format); + pr(" %s\n", com->c_form); } } pr("For further info on command syntax see \"info Syntax\".\n"); -- 2.43.0