Update copyright notice

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

diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c
index c170e22bce3802f839728a5edcc7cdde94b7a7d0..b979b5c5656d42aed3f0ce970f3bb73590696bae 100644 (file)
--- a/src/lib/commands/demo.c
+++ b/src/lib/commands/demo.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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,32 +14,24 @@
  *  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.
  *
  *  ---
  *
  *  demo.c: De-mobilize "n" military in a given sector
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
 
 /*
@@ -47,49 +39,33 @@
  *
  */
 
-static long do_demo(struct natstr *natp, struct nstr_sect nstr, int number,
-                   s_char *p, int for_real);
-
 int
 demo(void)
 {
     struct natstr *natp;
-    long cash;
-    long cost;
     int number;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
     struct nstr_sect nstr;
+    struct sctstr sect;
+    int mil_demob;
+    int mil;
+    int civ;
+    int deltamil;
+    int reserves;
 
     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)))
        return RET_SYN;
     number = atoi(p);
-    if (!(p = getstarg(player->argp[3],
-                      "New civilians on active reserve? (y/n) ", buf)))
+    p = getstarg(player->argp[3],
+                "New civilians on active reserve? (y/n) ", buf);
+    if (!p)
        return RET_SYN;
     if (*p != 'y' && *p != 'n')
        return RET_SYN;
-    cost = do_demo(natp, nstr, number, p, 0);
-    if (chkmoney(cost, cash, player->argp[4]))
-       return RET_SYN;
-    return (int)do_demo(natp, nstr, number, p, 1);
-}
-
-static long
-do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
-       int for_real)
-{
-    struct sctstr sect;
-    int mil_demob;
-    int mil;
-    int civ;
-    int deltamil;
-    int reserves;
-    long cost = 0;
 
     mil_demob = 0;
     reserves = 0;
@@ -106,14 +82,15 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
            continue;
        if (deltamil > ITEM_MAX - civ)
            deltamil = ITEM_MAX - civ;
+       if (player->dolcost + deltamil * 5 > natp->nat_money) {
+           pr("You can't afford to demobilize %d military in %s!\n",
+              deltamil, xyas(sect.sct_x, sect.sct_y, player->cnum));
+           break;
+       }
+       player->dolcost += deltamil * 5;
        civ += deltamil;
        mil -= deltamil;
        mil_demob += deltamil;
-       if (!for_real) {
-           cost += deltamil * 5;
-           continue;
-       }
-       player->dolcost += deltamil * 5;
        pr("%d demobilized in %s (%d mil left)\n",
           deltamil, xyas(sect.sct_x, sect.sct_y, player->cnum), mil);
        if (*p == 'y')
@@ -122,11 +99,9 @@ do_demo(struct natstr *natp, struct nstr_sect nstr, int number, s_char *p,
        sect.sct_item[I_CIVIL] = civ;
        putsect(&sect);
     }
-    if (!for_real)
-       return cost;
     if (!mil_demob) {
        pr("No eligible sectors/military for demobilization\n");
-       return (long)RET_FAIL;
+       return RET_FAIL;
     }
     pr("Total new civilians : %d\n", mil_demob);
     if (*p == 'y')