empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(deliver): Do not deliver friendly civilians into occupied sectors.

Browse source
This commit is contained in:
Markus Armbruster 2005-06-26 13:32:15 +00:00
parent 6e3442b68e
commit bf83673bb5
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/lib/update/deliver.c
View file

@ -80,11 +80,18 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
dp = &dchr[from->sct_type];
vtype = ip->i_vtype;
mobility = from->sct_mobil / 2;
if (vtype == I_CIVIL && from->sct_own != from->sct_oldown) {
wu(0, from->sct_own,
"The conquered populace in %s refuses to relocate!\n",
ownxy(from));
return 0;
if (vtype == I_CIVIL) {
if (from->sct_own != from->sct_oldown) {
wu(0, from->sct_own,
"The conquered populace in %s refuses to relocate!\n",
ownxy(from));
return 0;
}
if (to->sct_own != to->sct_oldown) {
wu(0, from->sct_own,
"Citizens in %s refuse to relocate!\n", ownxy(from));
return 0;
}
}
/*
* disallow delivery into prohibited sectors.