Fix trailing whitespace

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

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index 1aef5baa5eae7785593f1db123f4c29ea0027e83..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,73 +49,64 @@
 #include "sect.h"
 #include "xy.h"
 
-static int checksect(struct sctstr *);
-
 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);
 }
 
 void
-sct_prewrite(int id, void *ptr)
-{
-    struct sctstr *sp = ptr;
-
-    bridge_damaged(sp);
-    checksect(sp);
-}
-
-void
-item_prewrite(short *item)
-{
-    i_type i;
-
-    for (i = I_NONE + 1; i <= I_MAX; ++i) {
-       if (CANT_HAPPEN(item[i] < 0))
-           item[i] = 0;
-       else if (CANT_HAPPEN(item[i] > ITEM_MAX))
-           item[i] = ITEM_MAX;
-    }
-}
-
-static int
-checksect(struct sctstr *sp)
+sct_prewrite(int id, void *old, void *new)
 {
+    struct sctstr *oldsp = old;
+    struct sctstr *sp = new;
     int mil, civs;
     natid 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;
 
-    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 = 0;
        sp->sct_mobil = 0;
        if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
            caploss(sp, own, "");
     }
-    return 1;
+
+    /* 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);
+
+    sp->sct_own = own;
+}
+
+void
+item_prewrite(short *item)
+{
+    i_type i;
+
+    for (i = I_NONE + 1; i <= I_MAX; ++i) {
+       if (CANT_HAPPEN(item[i] < 0))
+           item[i] = 0;
+       else if (CANT_HAPPEN(item[i] > ITEM_MAX))
+           item[i] = ITEM_MAX;
+    }
 }
 
 int