Fix trailing whitespace

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

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index febaaae1e8df65d484ccdcfa351c92f02070114a..cae10971ffdb769d388220063031378be7386f39 100644 (file)
--- a/src/lib/subs/sect.c
+++ b/src/lib/subs/sect.c
@@ -26,10 +26,11 @@
  *  ---
  *
  *  sect.c: Sector pre-write and post-read data massage
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2004-2008
  */
 
 #include <config.h>
@@ -48,32 +49,51 @@
 #include "sect.h"
 #include "xy.h"
 
-static int checksect(struct sctstr *);
-
-int
+void
 sct_postread(int id, void *ptr)
 {
     struct sctstr *sp = ptr;
 
-    checksect(sp);
     player->owner = (player->god || sp->sct_own == player->cnum);
     if (opt_MOB_ACCESS)
        sct_do_upd_mob(sp);
-    return 1;
 }
 
-int
-sct_prewrite(int id, void *ptr)
+void
+sct_prewrite(int id, void *old, void *new)
 {
-    struct sctstr *sp = ptr;
-    struct sctstr sect;
+    struct sctstr *oldsp = old;
+    struct sctstr *sp = new;
+    int mil, civs;
+    natid own;
+
+    bridge_damaged(sp);
+    item_prewrite(sp->sct_item);
+
+    mil = sp->sct_item[I_MILIT];
+    civs = sp->sct_item[I_CIVIL];
+    own = sp->sct_own;
+
+    if (own && !civs) {
+       sp->sct_work = 100;
+       sp->sct_oldown = own;
+    }
+
+    if (own && !civs && !mil && !has_units(sp->sct_x, sp->sct_y, own, NULL)
+       && !(sp->sct_flags & MOVE_IN_PROGRESS)) {
+       /* more cruft! */
+       own = 0;
+       sp->sct_mobil = 0;
+       if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
+           caploss(sp, own, "");
+    }
 
-    time(&sp->sct_timestamp);
+    /* We've avoided assigning to sp->sct_own, in case oldsp == sp */
+    if (oldsp->sct_own != own)
+       lost_and_found(EF_SECTOR, oldsp->sct_own, own,
+                      0, sp->sct_x, sp->sct_y);
 
-    bridge_damaged(sp, NULL);
-    checksect(sp);
-    getsect(sp->sct_x, sp->sct_y, &sect);
-    return 1;
+    sp->sct_own = own;
 }
 
 void
@@ -89,47 +109,6 @@ item_prewrite(short *item)
     }
 }
 
-static int
-checksect(struct sctstr *sp)
-{
-    int mil, civs, loyalcivs;
-
-    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];
-    if (sp->sct_own == sp->sct_oldown)
-       loyalcivs = civs;
-    else
-       loyalcivs = 0;
-
-    if (sp->sct_own != 0 && !civs) {
-       sp->sct_work = 100;
-       sp->sct_oldown = sp->sct_own;
-    }
-    /* If they have a military unit there, they still own it */
-    if (sp->sct_own && !loyalcivs && !(sp->sct_flags & MOVE_IN_PROGRESS)) {
-       if (!mil && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, 0)) {
-           /* more cruft! */
-           if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
-               caploss(sp, sp->sct_own, "");
-
-           if (sp->sct_oldown == sp->sct_own) {
-               makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
-               sp->sct_own = 0;
-               sp->sct_oldown = 0;
-           } else
-               takeover(sp, sp->sct_oldown);
-           sp->sct_mobil = 0;
-       }
-    }
-    return 1;
-}
-
 int
 issector(char *arg)
 {