License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c
index a41f2cbfb366445a03692d7fd57c1ec3cc0ca6c4..43f9451a34299fc8864429f2db587208d3ce180c 100644 (file)
--- a/src/lib/commands/rese.c
+++ b/src/lib/commands/rese.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  rese.c: Reset (lower) commodity prices
- * 
+ *
  *  Known contributors to this file:
  *     Jeff Bailey
  *     Pat Loney, 1992
@@ -35,20 +34,13 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "xy.h"
-#include "file.h"
-#include "sect.h"
+#include "commands.h"
+#include "commodity.h"
 #include "item.h"
-#include "nsc.h"
-#include "nat.h"
 #include "land.h"
+#include "optlist.h"
 #include "plane.h"
 #include "ship.h"
-#include "commodity.h"
-#include "player.h"
-#include "commands.h"
-#include "optlist.h"
 
 int
 rese(void)
@@ -68,8 +60,8 @@ rese(void)
     }
     check_market();
     check_trade();
-    if ((p = getstarg(player->argp[1], "Which lot :  ", buf)) == 0
-       || *p == 0)
+    p = getstarg(player->argp[1], "Which lot :  ", buf);
+    if (!p || !*p)
        return RET_SYN;
     number_set = atoi(p);
     getcomm(number_set, &comm);
@@ -81,8 +73,8 @@ rese(void)
        pr("Some one already has a bid out on that\n");
        return RET_OK;
     }
-    if ((p = getstarg(player->argp[2], "New (lower) price: ", buf)) == 0
-       || *p == 0)
+    p = getstarg(player->argp[2], "New (lower) price: ", buf);
+    if (!p || !*p)
        return RET_SYN;
     if (!check_comm_ok(&comm))
        return RET_FAIL;
@@ -94,7 +86,7 @@ rese(void)
            return RET_OK;
        }
        if (player->god) {
-           if ((p = getstring("Really destroy that lot? ", buf)) == 0)
+           if (!(p = getstring("Really destroy that lot? ", buf)))
                return RET_FAIL;
            if (!check_comm_ok(&comm))
                return RET_FAIL;
@@ -141,7 +133,7 @@ rese(void)
     (void)time(&now);
     comm.com_markettime = now;
     if (!putcomm(number_set, &comm)) {
-       pr("Problems with the commodities file, Call the Deity\n");
+       pr("Problems with the commodities file, call the Deity\n");
        return RET_OK;
     }
     return RET_OK;