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

Permit no-op country name change again

Browse source 
Commit aa5861d1 (v4.3.20) made add, edit and change reject a country
name that is already in use.  Even if it's used by the same country.
Relax that.
This commit is contained in:
Markus Armbruster 2011-10-30 15:43:56 +01:00
parent 9b2e906ea1
commit 062c660e28
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/subs/natsub.c
View file

@ -27,7 +27,7 @@
* nat.c: Nation subroutines
*
* Known contributors to this file:
* Markus Armbruster, 2009
* Markus Armbruster, 2009-2011
* Ron Koenderink, 2008-2009
*/
@ -117,7 +117,7 @@ nat_reset(struct natstr *natp, enum nat_status stat, coord x, coord y)
}
int
check_nat_name(char *cname)
check_nat_name(char *cname, natid cnum)
{
struct natstr *natp;
natid cn;
@ -143,7 +143,7 @@ check_nat_name(char *cname)
}
for (cn = 0; NULL != (natp = getnatp(cn)); cn++) {
if (!strcmp(cname, natp->nat_cnam)) {
if (cn != cnum && !strcmp(cname, natp->nat_cnam)) {
pr("Country #%d is already called `%s'\n", cn, cname);
return 0;
}