Update copyright notice

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

diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c
index ec6d628d574aa891e3e86fc677e8cb8bd7b32061..1a4674f53a1643fd3857e19a870ff1c23980d752 100644 (file)
--- a/src/lib/commands/demo.c
+++ b/src/lib/commands/demo.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,15 +31,8 @@
  *     Dave Pare, 1986
  */
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "deity.h"
-#include "var.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
 
 /*
@@ -48,7 +41,7 @@
  */
 
 static long do_demo(struct natstr *natp, struct nstr_sect nstr, int number,
-                   s_char *p, int for_real);
+                   char *p, int for_real);
 
 int
 demo(void)
@@ -57,22 +50,19 @@ demo(void)
     long cash;
     long cost;
     int number;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     struct nstr_sect nstr;
 
     natp = getnatp(player->cnum);
     cash = natp->nat_money;
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
-    if ((p =
-        getstarg(player->argp[2], "Number to de-mobilize : ", buf)) == 0)
+    if (!(p = getstarg(player->argp[2], "Number to de-mobilize : ", buf)))
        return RET_SYN;
     number = atoi(p);
-    if (!
-       (p =
-        getstarg(player->argp[3],
-                 "New civilians on active reserve? (y/n) ", buf)))
+    if (!(p = getstarg(player->argp[3],
+                      "New civilians on active reserve? (y/n) ", buf)))
        return RET_SYN;
     if (*p != 'y' && *p != 'n')
        return RET_SYN;
@@ -83,7 +73,7 @@ demo(void)
 }
 
 static long
-do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
+do_demo(struct natstr *natp, struct nstr_sect nstr, int number, char *p,
        int for_real)
 {
     struct sctstr sect;
@@ -99,16 +89,16 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
     while (nxtsct(&nstr, &sect)) {
        if (!player->owner || sect.sct_effic < 60)
            continue;
-       if ((mil = getvar(V_MILIT, (s_char *)&sect, EF_SECTOR)) == 0)
+       if ((mil = sect.sct_item[I_MILIT]) == 0)
            continue;
        if (sect.sct_own != sect.sct_oldown)
            continue;
-       civ = getvar(V_CIVIL, (s_char *)&sect, EF_SECTOR);
-       if (number < 0) {
-           if ((deltamil = mil + number) <= 0)
-               continue;
-       } else if ((deltamil = min(mil, number)) <= 0)
+       civ = sect.sct_item[I_CIVIL];
+       deltamil = number < 0 ? mil + number : MIN(mil, number);
+       if (deltamil <= 0)
            continue;
+       if (deltamil > ITEM_MAX - civ)
+           deltamil = ITEM_MAX - civ;
        civ += deltamil;
        mil -= deltamil;
        mil_demob += deltamil;
@@ -121,8 +111,8 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
           deltamil, xyas(sect.sct_x, sect.sct_y, player->cnum), mil);
        if (*p == 'y')
            reserves += deltamil;
-       putvar(V_MILIT, mil, (s_char *)&sect, EF_SECTOR);
-       putvar(V_CIVIL, civ, (s_char *)&sect, EF_SECTOR);
+       sect.sct_item[I_MILIT] = mil;
+       sect.sct_item[I_CIVIL] = civ;
        putsect(&sect);
     }
     if (!for_real)
@@ -133,7 +123,7 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
     }
     pr("Total new civilians : %d\n", mil_demob);
     if (*p == 'y')
-       pr("Military reserve stands at %d (up %d)\n",
+       pr("Military reserve stands at %ld (up %d)\n",
           natp->nat_reserve + reserves, reserves);
     if (reserves > 0) {
        natp->nat_reserve += reserves;