Update copyright notice

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

diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 6037e4bfe979a54474292096d3046efb6446968d..a5e0149eb1c8dc721bd52237e35b069ac1772303 100644 (file)
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,10 +26,11 @@
  *  ---
  *
  *  takeover.c: Take over from another country
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1996-2000
+ *     Markus Armbruster, 2007-2008
  */
 
 #include <config.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);
@@ -224,6 +226,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 +234,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();