Replace "roll0(N) + M" by "roll(N) + M-1"

[empserver] / src / lib / subs / takeover.c

diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 6037e4bfe979a54474292096d3046efb6446968d..996b01314e1eb850886d5125155ec6c7939f870a 100644 (file)
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,14 +25,16 @@
  *  ---
  *
  *  takeover.c: Take over from another country
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1996-2000
+ *     Markus Armbruster, 2007-2012
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "file.h"
 #include "empobj.h"
 #include "game.h"
@@ -47,6 +48,7 @@
 #include "prototypes.h"
 #include "sect.h"
 #include "ship.h"
+#include "unit.h"
 #include "xy.h"
 
 static void takeover_unit(struct empobj *, natid);
@@ -98,7 +100,7 @@ takeover(struct sctstr *sp, natid newown)
            if (!(chance(LND_SPY_DETECT_CHANCE(lp->lnd_effic))))
                continue;
        }
-       n = lp->lnd_effic - (30 + (random() % 100));
+       n = lp->lnd_effic - (29 + roll(100));
        if (n < 0)
            n = 0;
        lp->lnd_effic = n;
@@ -127,8 +129,7 @@ takeover(struct sctstr *sp, natid newown)
      * how spunky are these guys?
      * n: random number from -25:75 + (50 - loyalty)
      */
-    n = (50 - sp->sct_loyal) + ((random() % 100) - 25);
-    che_count = 0;
+    n = (50 - sp->sct_loyal) + (roll(100) - 26);
     if (n > 0 && sp->sct_own == sp->sct_oldown) {
        che_count = (civ * n / 3000) + 5;
        if (che_count * 2 > civ)
@@ -185,7 +186,7 @@ takeover_plane(struct plnstr *pp, natid newown)
      * XXX If this was done right, planes could escape,
      * flying to a nearby friendly airport.
      */
-    n = pp->pln_effic - (30 + (random() % 100));
+    n = pp->pln_effic - (29 + roll(100));
     if (n < 0)
        n = 0;
     pp->pln_effic = n;
@@ -224,6 +225,7 @@ takeover_unit(struct empobj *unit, natid newown)
     struct shpstr *sp;
     struct plnstr *pp;
     struct lndstr *lp;
+    struct nukstr *np;
     int type;
     struct nstr_item ni;
     union empobj_storage cargo;
@@ -231,27 +233,29 @@ takeover_unit(struct empobj *unit, natid newown)
     unit->own = newown;
     if (opt_MARKET)
        trdswitchown(unit->ef_type, unit, newown);
-    unit->group = 0;
-    unit->mission = 0;
+    unit_wipe_orders(unit);
 
     switch (unit->ef_type) {
     case EF_SHIP:
        sp = (struct shpstr *)unit;
-       sp->shp_rflags = 0;
-       memset(sp->shp_rpath, 0, sizeof(sp->shp_rpath));
+       sp->shp_off = 1;
        break;
     case EF_PLANE:
        pp = (struct plnstr *)unit;
        if (pp->pln_mobil > 0)
            pp->pln_mobil = 0;
+       pp->pln_off = 1;
        break;
     case EF_LAND:
        lp = (struct lndstr *)unit;
        if (lp->lnd_mobil > 0)
            lp->lnd_mobil = 0;
+       lp->lnd_off = 1;
        lp->lnd_harden = 0;
        break;
     case EF_NUKE:
+       np = (struct nukstr *)unit;
+       np->nuk_off = 1;
        break;
     default:
        CANT_REACH();