License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/fort.c b/src/lib/commands/fort.c
index fe44c288c09542d8cf10af65711bfdafd2151b22..e31956d67c9d5c423648270028dfaec073031237 100644 (file)
--- a/src/lib/commands/fort.c
+++ b/src/lib/commands/fort.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-2011, 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/>.
  *
  *  ---
  *
@@ -50,7 +49,7 @@ fort(void)
     if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
     p = getstarg(player->argp[2], "Amount: ", buf);
-    if (p == 0 || *p == 0)
+    if (!p || !*p)
        return RET_SYN;
     fort_amt = atoi(p);
     if (fort_amt > land_mob_max)
@@ -82,7 +81,7 @@ fort(void)
        if (hard_amt <= 0)
            continue;
 
-       if (lnd_fortify (&land, hard_amt) <= 0) {
+       if (lnd_fortify(&land, hard_amt) <= 0) {
            pr("%s can't be fortified%s\n", prland(&land),
               land.lnd_harden >= land_mob_max ? " any further" : "");
            continue;