Markus Armbruster
5e54219606
We maintain a few sector invariants in sct_prewrite(). Since the update bypasses sct_prewrite(), it needs to maintain them itself. The two should be consistent. When a deserted sector reverts to the deity, sct_prewrite() clears owner and mobility. It neglects to clear the old owner, unlike populace(). Harmless, but fix it anyway for consistency. Visible in tests/navi-march/final.xdump. Work percentage, loyalty and old owner apply to civilians. When there are none, sct_prewrite() sets work percentage to 100 and old owner to owner. It neglects to clear loyalty, unlike populace(). Loyalty persists until populace() clears it. Most of the time, this doesn't matter, as moving civilians into a sector without civilians ignores the sector's loyalty. However, airlifted and unloaded civilians adopt the sector's loyalty (bug#49 and bug#255). Fix sct_prewrite() to clear loyalty for consistency, and to mitigate these bugs. Note that populace() may not always clear loyalty right away. This will be fixed in the next commit. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
127 lines
3 KiB
C
127 lines
3 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure, Markus Armbruster
|
|
*
|
|
* 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 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* ---
|
|
*
|
|
* See files README, COPYING and CREDITS in the root of the source
|
|
* tree for related information and legal notices. It is expected
|
|
* that future projects/authors will amend these files as needed.
|
|
*
|
|
* ---
|
|
*
|
|
* 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 "lost.h"
|
|
#include "misc.h"
|
|
#include "nsc.h"
|
|
#include "optlist.h"
|
|
#include "player.h"
|
|
#include "prototypes.h"
|
|
#include "sect.h"
|
|
#include "xy.h"
|
|
|
|
void
|
|
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);
|
|
}
|
|
|
|
void
|
|
sct_prewrite(int id, void *old, void *new)
|
|
{
|
|
struct sctstr *oldsp = old;
|
|
struct sctstr *sp = new;
|
|
coord x, y;
|
|
int mil, civs;
|
|
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);
|
|
|
|
mil = sp->sct_item[I_MILIT];
|
|
civs = sp->sct_item[I_CIVIL];
|
|
own = sp->sct_own;
|
|
prev_own = oldsp->sct_own;
|
|
|
|
if (!civs) {
|
|
sp->sct_work = 100;
|
|
sp->sct_loyal = 0;
|
|
sp->sct_oldown = own;
|
|
}
|
|
|
|
/*
|
|
* 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)) {
|
|
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, "");
|
|
}
|
|
|
|
if (prev_own != own)
|
|
lost_and_found(EF_SECTOR, prev_own, own, 0, sp->sct_x, sp->sct_y);
|
|
}
|
|
|
|
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
|
|
issector(char *arg)
|
|
{
|
|
char c;
|
|
|
|
while (0 != (c = *arg++))
|
|
if (!isdigit(c) && !isspace(c) && (c != '/'))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|