commands: Rename the command functions

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

diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c
index 4fa1d6bc9d6834c9c078cedf3ba61340d1641b77..f6994c0673241f9c87ce527169db4bc0f71b842e 100644 (file)
--- a/src/lib/commands/nati.c
+++ b/src/lib/commands/nati.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -37,7 +36,7 @@
 #include "optlist.h"
 
 int
-nati(void)
+c_nation(void)
 {
     struct natstr *natp;
     struct sctstr sect;
@@ -60,7 +59,7 @@ nati(void)
        return RET_FAIL;
     }
 
-    pr("\n(#%i) %s Nation Report\t", cnum, cname(cnum));
+    pr("\n(#%d) %s Nation Report\t", cnum, cname(cnum));
     prdate();
     pr("Nation status is %s", natstate(natp));
     pr("     Bureaucratic Time Units: %d\n", natp->nat_btu);
@@ -68,19 +67,19 @@ nati(void)
        getsect(natp->nat_xcap, natp->nat_ycap, &sect);
        if (influx(natp))
            pr("No capital (was at %s).\n",
-              xyas(sect.sct_x, sect.sct_y, cnum));
+              xyas(sect.sct_x, sect.sct_y, player->cnum));
        else {
            civ = sect.sct_item[I_CIVIL];
            mil = sect.sct_item[I_MILIT];
            pr("%d%% eff %s at %s has %d civilian%s & %d military\n",
               sect.sct_effic,
               sect.sct_type == SCT_CAPIT ? "capital" : "mountain capital",
-              xyas(sect.sct_x, sect.sct_y, cnum), civ, splur(civ),
-              mil);
+              xyas(sect.sct_x, sect.sct_y, player->cnum),
+              civ, splur(civ), mil);
        }
     }
     pr(" The treasury has $%.2f", (double)natp->nat_money);
-    pr("     Military reserves: %ld\n", natp->nat_reserve);
+    pr("     Military reserves: %d\n", natp->nat_reserve);
     pr("Education..........%6.2f       Happiness.......%6.2f\n",
        natp->nat_level[NAT_ELEV], natp->nat_level[NAT_HLEV]);
     pr("Technology.........%6.2f       Research........%6.2f\n",