Update copyright notice

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

diff --git a/src/lib/commands/enli.c b/src/lib/commands/enli.c
index 8e2c0f9860b1c826f4adce9a529e095a58d68e21..4cb744195c94327fe09035bae8390152b240ef3b 100644 (file)
--- a/src/lib/commands/enli.c
+++ b/src/lib/commands/enli.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, 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,33 +14,27 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  enli.c: Enlist some military
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
-#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 "chance.h"
 #include "commands.h"
+#include "treaty.h"
 
 int
 enli(void)
@@ -53,11 +47,11 @@ enli(void)
     int newmil;
     int milwant;
     int totalmil;
-    long reserve;
-    s_char *p;
+    int reserve;
+    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;
@@ -66,7 +60,7 @@ enli(void)
     natp = getnatp(player->cnum);
     newmil = 500;
     sprintf(prompt, "Number to enlist (max %d) : ", newmil);
-    if ((p = getstarg(player->argp[2], prompt, buf)) == 0)
+    if (!(p = getstarg(player->argp[2], prompt, buf)))
        return RET_SYN;
     if ((milwant = atoi(p)) > newmil)
        milwant = newmil;
@@ -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");
@@ -131,12 +123,12 @@ enli(void)
        }
     }
     pr("Total new enlistment : %d\n", totalmil);
-    pr("Military reserves stand at %ld\n", reserve);
+    pr("Military reserves stand at %d\n", reserve);
     if (totalmil) {
        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;
 }