Update copyright notice

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

diff --git a/src/lib/commands/enli.c b/src/lib/commands/enli.c
index 83cee7dea3c16073f19f2c6d9d8c99570b147e16..4f669dcb53d29be2eb239cb342270b12210f45dd 100644 (file)
--- a/src/lib/commands/enli.c
+++ b/src/lib/commands/enli.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,16 +31,10 @@
  *     
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "treaty.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "treaty.h"
 
 int
 enli(void)
@@ -54,10 +48,10 @@ enli(void)
     int milwant;
     int totalmil;
     long reserve;
-    s_char *p;
+    char *p;
     int quota;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
@@ -116,10 +110,8 @@ enli(void)
        sect.sct_item[I_CIVIL] = civ - newmil;
        pr("%3d enlisted in %s (%d)\n", newmil,
           xyas(sect.sct_x, sect.sct_y, player->cnum), mil + newmil);
-       if (sect.sct_mobil > 0) {
-           sect.sct_mobil = (u_char)((float)sect.sct_mobil *
-                                     (1.0 - (float)newmil / (float)civ));
-       }
+       if (sect.sct_mobil > 0)
+           sect.sct_mobil *= 1.0 - (double)newmil / (double)civ;
        putsect(&sect);
        if (totalmil >= 10000) {
            pr("Rioting in induction center interrupts enlistment\n");
@@ -136,7 +128,7 @@ enli(void)
        natp->nat_reserve -= totalmil;
        putnat(natp);
     }
-    if ((player->btused += roundavg((float)totalmil * 0.02)) > 0)
+    if ((player->btused += roundavg(totalmil * 0.02)) > 0)
        pr("Paperwork at recruiting stations ... %d\n", player->btused);
     return RET_OK;
 }