Move declarations for chance.c to new chance.h

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

diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 43ffddedde1004bd12a0b0fd1f8c1e1227cd97f6..3a2ec8ead682e67a81cdeb653ca822cee280cf18 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-2010
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "file.h"
 #include "empobj.h"
 #include "game.h"
@@ -129,7 +130,6 @@ takeover(struct sctstr *sp, natid newown)
      * n: random number from -25:75 + (50 - loyalty)
      */
     n = (50 - sp->sct_loyal) + ((random() % 100) - 25);
-    che_count = 0;
     if (n > 0 && sp->sct_own == sp->sct_oldown) {
        che_count = (civ * n / 3000) + 5;
        if (che_count * 2 > civ)
@@ -225,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;
@@ -237,19 +238,24 @@ takeover_unit(struct empobj *unit, natid newown)
     switch (unit->ef_type) {
     case EF_SHIP:
        sp = (struct shpstr *)unit;
+       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();