Update copyright notice

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

diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c
index 6fdc412cecfc6e9c24a29803075d122f88004b97..3bc9a7d25b4a14bd3d1d931d687ddd8547eedc26 100644 (file)
--- a/src/lib/commands/nati.c
+++ b/src/lib/commands/nati.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -33,14 +33,8 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nat.h"
-#include "sect.h"
-#include "file.h"
-#include "xy.h"
-#include "optlist.h"
 #include "commands.h"
+#include "optlist.h"
 
 int
 nati(void)
@@ -89,37 +83,24 @@ nati(void)
     pr(" The treasury has $%.2f", (double)natp->nat_money);
     pr("     Military reserves: %ld\n", natp->nat_reserve);
     pr("Education..........%6.2f       Happiness.......%6.2f\n",
-       (double)natp->nat_level[NAT_ELEV],
-       (double)natp->nat_level[NAT_HLEV]);
+       natp->nat_level[NAT_ELEV], natp->nat_level[NAT_HLEV]);
     pr("Technology.........%6.2f       Research........%6.2f\n",
-       (double)natp->nat_level[NAT_TLEV],
-       (double)natp->nat_level[NAT_RLEV]);
+       natp->nat_level[NAT_TLEV], natp->nat_level[NAT_RLEV]);
     pr("Technology factor :%6.2f%%", tfact(cnum, 100.));
 
     if (opt_NO_PLAGUE)
        pfac = 0.0;
     else
-       pfac = ((double)natp->nat_level[NAT_TLEV] + 100.) /
-           ((double)natp->nat_level[NAT_RLEV] + 100.);
+       pfac = (natp->nat_level[NAT_TLEV] + 100.0) /
+           (natp->nat_level[NAT_RLEV] + 100.0);
     pr("     Plague factor : %6.2f%%\n", pfac);
     pr("\n");
 
     poplimit = max_population(natp->nat_level[NAT_RLEV], SCT_MINE, 0);
     pr("Max population : %d\n", poplimit);
 
-    safepop =
-       (int)((double)poplimit / (1.0 + obrate * (double)etu_per_update));
-    uwpop =
-       (int)((double)poplimit / (1.0 + uwbrate * (double)etu_per_update));
-    safepop++;
-    if (((double)safepop * (1.0 + obrate * (double)etu_per_update)) >
-       ((double)poplimit + 0.0000001))
-       safepop--;
-    uwpop++;
-    if (((double)uwpop * (1.0 + uwbrate * (double)etu_per_update)) >
-       ((double)poplimit + 0.0000001))
-       uwpop--;
-
+    safepop = (int)(poplimit / (1.0 + obrate * (double)etu_per_update));
+    uwpop = (int)(poplimit / (1.0 + uwbrate * (double)etu_per_update));
     pr("Max safe population for civs/uws: %d/%d\n", safepop, uwpop);
 
     hap = hap_req(natp);