* ---
*
* 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>
#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)
+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);
- checksect(sp);
- getsect(sp->sct_x, sp->sct_y, §);
+ 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, "");
+ }
+
+ /* 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
}
}
-static int
-checksect(struct sctstr *sp)
-{
- int mil, civs, loyalcivs;
- natid own;
-
- 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! */
- own = 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;
- if (sp->sct_type == SCT_CAPIT || sp->sct_type == SCT_MOUNT)
- caploss(sp, own, "");
- }
- }
- return 1;
-}
-
int
issector(char *arg)
{