Update copyright notice

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

diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c
index 4d6f45fd37353934754e66c36393723ae00d133b..b979b5c5656d42aed3f0ce970f3bb73590696bae 100644 (file)
--- a/src/lib/commands/demo.c
+++ b/src/lib/commands/demo.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-2012, 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/>.
  *
  *  ---
  *
@@ -61,8 +60,9 @@ demo(void)
     if (!(p = getstarg(player->argp[2], "Number to de-mobilize : ", buf)))
        return RET_SYN;
     number = atoi(p);
-    if (!(p = getstarg(player->argp[3],
-                      "New civilians on active reserve? (y/n) ", buf)))
+    p = getstarg(player->argp[3],
+                "New civilians on active reserve? (y/n) ", buf);
+    if (!p)
        return RET_SYN;
     if (*p != 'y' && *p != 'n')
        return RET_SYN;