Update copyright notice

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

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index 3e1ef145b73a0a97534ca7d3ce2ab2ed77491cfb..7891c483a61ee888f398d4779eb17d67c8ce623f 100644 (file)
--- a/src/lib/subs/sect.c
+++ b/src/lib/subs/sect.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 #include <config.h>
 
 #include <ctype.h>
-#include "file.h"
+#include "game.h"
 #include "lost.h"
 #include "misc.h"
 #include "nsc.h"
@@ -43,6 +43,7 @@
 #include "player.h"
 #include "prototypes.h"
 #include "sect.h"
+#include "update.h"
 #include "xy.h"
 
 void
@@ -51,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
@@ -78,8 +81,9 @@ sct_prewrite(int id, void *old, void *new)
     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;
     }
 
@@ -90,6 +94,7 @@ sct_prewrite(int id, void *old, void *new)
     if (own && !civs && !mil && !has_units(sp->sct_x, sp->sct_y, own)
        && !(sp->sct_flags & MOVE_IN_PROGRESS)) {
        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, prev_own, "");