Clean up superfluous includes

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

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index 70f93d1856e2a0fa70d2ccd7178f19579e9f4e69..9ac18dff27ef9f391cd78560d461311371ecd1ba 100644 (file)
--- a/src/lib/subs/sect.c
+++ b/src/lib/subs/sect.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-2011, 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,23 +25,21 @@
  *  ---
  *
  *  sect.c: Sector pre-write and post-read data massage
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2004-2010
  */
 
 #include <config.h>
 
 #include <ctype.h>
 #include "file.h"
-#include "land.h"
 #include "lost.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "optlist.h"
-#include "plane.h"
 #include "player.h"
 #include "prototypes.h"
 #include "sect.h"
@@ -59,38 +56,37 @@ sct_postread(int id, void *ptr)
 }
 
 void
-sct_prewrite(int id, void *ptr)
+sct_prewrite(int id, void *old, void *new)
 {
-    struct sctstr *sp = ptr;
+    struct sctstr *oldsp = old;
+    struct sctstr *sp = new;
     int mil, civs;
-    natid own;
+    natid own, prev_own;
 
     bridge_damaged(sp);
     item_prewrite(sp->sct_item);
 
-    /* shouldn't happen, but... */
-    if (sp->sct_mobil > 127)
-       sp->sct_mobil = 0;
-
     mil = sp->sct_item[I_MILIT];
     civs = sp->sct_item[I_CIVIL];
+    own = sp->sct_own;
+    prev_own = oldsp->sct_own;
 
-    if (sp->sct_own != 0 && !civs) {
+    if (own && !civs) {
        sp->sct_work = 100;
-       sp->sct_oldown = sp->sct_own;
+       sp->sct_oldown = own;
     }
 
-    if (sp->sct_own && !civs && !mil
-       && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, NULL)
+    if (own && !civs && !mil && !has_units(sp->sct_x, sp->sct_y, own, NULL)
        && !(sp->sct_flags & MOVE_IN_PROGRESS)) {
        /* more cruft! */
-       own = sp->sct_own;
-       makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
-       sp->sct_own = 0;
+       own = sp->sct_own = 0;
        sp->sct_mobil = 0;
        if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
-           caploss(sp, own, "");
+           caploss(sp, prev_own, "");
     }
+
+    if (prev_own != own)
+       lost_and_found(EF_SECTOR, prev_own, own, 0, sp->sct_x, sp->sct_y);
 }
 
 void