Update copyright notice

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

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index 02f979b5a3a92129fd9f422026e388b1103d01f9..7891c483a61ee888f398d4779eb17d67c8ce623f 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-2021, 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,26 +25,25 @@
  *  ---
  *
  *  sect.c: Sector pre-write and post-read data massage
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
 
 #include <ctype.h>
-#include "file.h"
-#include "land.h"
+#include "game.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"
+#include "update.h"
 #include "xy.h"
 
 void
@@ -54,8 +52,10 @@ sct_postread(int id, void *ptr)
     struct sctstr *sp = ptr;
 
     player->owner = (player->god || sp->sct_own == player->cnum);
-    if (opt_MOB_ACCESS)
-       sct_do_upd_mob(sp);
+
+    if (opt_MOB_ACCESS && sp->sct_own && sp->sct_type != SCT_SANCT
+       && !update_running)
+       mob_inc_sect(sp, game_tick_to_now(&sp->sct_access));
 }
 
 void
@@ -63,8 +63,15 @@ sct_prewrite(int id, void *old, void *new)
 {
     struct sctstr *oldsp = old;
     struct sctstr *sp = new;
+    coord x, y;
     int mil, civs;
-    natid own;
+    natid own, prev_own;
+
+    sctoff2xy(&x, &y, sp->sct_uid);
+    if (CANT_HAPPEN(sp->sct_x != x || sp->sct_y != y)) {
+       sp->sct_x = x;
+       sp->sct_y = y;
+    }
 
     bridge_damaged(sp);
     item_prewrite(sp->sct_item);
@@ -72,32 +79,29 @@ sct_prewrite(int id, void *old, void *new)
     mil = sp->sct_item[I_MILIT];
     civs = sp->sct_item[I_CIVIL];
     own = sp->sct_own;
+    prev_own = oldsp->sct_own;
 
-    if (own && !civs) {
+    if (!civs) {
        sp->sct_work = 100;
+       sp->sct_loyal = 0;
        sp->sct_oldown = own;
     }
 
-    if (own && !civs && !mil && !has_units(sp->sct_x, sp->sct_y, own, NULL)
+    /*
+     * Without civilians, military and land units, revert to deity.
+     * Note: would_abandon() must match this condition.
+     */
+    if (own && !civs && !mil && !has_units(sp->sct_x, sp->sct_y, own)
        && !(sp->sct_flags & MOVE_IN_PROGRESS)) {
-       /* more cruft! */
-       own = 0;
+       own = sp->sct_own = 0;
+       sp->sct_oldown = 0;
        sp->sct_mobil = 0;
        if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
-           caploss(sp, own, "");
-    }
-
-    /* We've avoided assigning to sp->sct_own, in case oldsp == sp */
-    if (oldsp->sct_own != own) {
-       if (oldsp->sct_own)
-           makelost(EF_SECTOR, oldsp->sct_own,
-                    0, sp->sct_x, sp->sct_y);
-       if (own)
-           makenotlost(EF_SECTOR, own,
-                       0, sp->sct_x, sp->sct_y);
+           caploss(sp, prev_own, "");
     }
 
-    sp->sct_own = own;
+    if (prev_own != own)
+       lost_and_found(EF_SECTOR, prev_own, own, 0, sp->sct_x, sp->sct_y);
 }
 
 void