Update copyright notice

[empserver] / src / lib / commands / chan.c

diff --git a/src/lib/commands/chan.c b/src/lib/commands/chan.c
index 176b4238027424dd4fa6190f8102a1129acb63cf..71c35800d34f608603735ee132f1ae9dce5be71f 100644 (file)
--- a/src/lib/commands/chan.c
+++ b/src/lib/commands/chan.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  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 2 of the License, or
+ *  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,
@@ -14,8 +14,7 @@
  *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -46,15 +45,10 @@ chan(void)
     char buf[1024];
     struct natstr *us;
 
-    if ((p =
-        getstarg(player->argp[1], "country name or representative? ",
-                 buf)) == 0)
+    p = getstarg(player->argp[1], "country name or representative? ", buf);
+    if (!p)
        return RET_SYN;
     us = getnatp(player->cnum);
-    if (us->nat_stat == STAT_VIS) {
-       pr("Visitor countries can't change their country name or representative.\n");
-       return RET_FAIL;
-    }
     switch (*p) {
     case 'n':
     case 'c':
@@ -76,10 +70,10 @@ chan(void)
                    charge = us->nat_money / 10;
            }
        }
-       if ((p =
-            getstarg(player->argp[2], "New country name -- ", buf)) == 0)
+       p = getstarg(player->argp[2], "New country name -- ", buf);
+       if (!p)
            return RET_SYN;
-       if (!check_nat_name(p))
+       if (!check_nat_name(p, player->cnum))
            return RET_FAIL;
        player->dolcost += charge;
        player->btused += btucost;
@@ -90,8 +84,8 @@ chan(void)
     case 'p':
     case 'r':
        pr("(note: these are stored in plain text.)\n");
-       if ((p = getstarg(player->argp[2],
-                         "New representative name -- ", buf)) == 0)
+       p = getstarg(player->argp[2], "New representative name -- ", buf);
+       if (!p)
            return RET_SYN;
        p[sizeof(us->nat_pnam) - 1] = 0;
        strcpy(us->nat_pnam, p);