Update copyright notice

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

diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c
index b76ae7b7f727cab29f2c7f115be8741aa70241c8..1a7e9925c564c019d1ceb4369f7988d95d6e7581 100644 (file)
--- a/src/lib/commands/rese.c
+++ b/src/lib/commands/rese.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,51 +19,41 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  rese.c: Reset (lower) commodity prices
- * 
+ *
  *  Known contributors to this file:
  *     Jeff Bailey
  *     Pat Loney, 1992
  *     Steve McClure, 1996
  */
 
-#include "misc.h"
-#include "xy.h"
-#include "file.h"
-#include "var.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
+#include "commodity.h"
 #include "item.h"
-#include "nsc.h"
-#include "nat.h"
 #include "land.h"
-#include "nuke.h"
+#include "optlist.h"
 #include "plane.h"
 #include "ship.h"
-#include "trade.h"
-#include <math.h>              /* bailey@math-cs.kent.edu */
-#include "commodity.h"
-#include "player.h"
-#include "commands.h"
-#include "optlist.h"
 
 int
 rese(void)
 {
     struct comstr comm;
     struct sctstr sect;
-    struct ichrstr *ix;
     int number_set;
     int m;
     char *p;
     float price;
     time_t now;
-    s_char buf[1024];
+    char buf[1024];
 
     if (!opt_MARKET) {
        pr("The market is disabled.\n");
@@ -71,8 +61,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);
@@ -84,8 +74,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;
@@ -97,7 +87,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;
@@ -117,18 +107,19 @@ rese(void)
            pr("The destination sector must be at least 60%% efficient.\n");
            return RET_OK;
        }
-       ix = whichitem(comm.com_type);
-       sect.sct_x = comm.sell_x;
-       sect.sct_y = comm.sell_y;
-       m = sect.sct_item[ix->i_vtype];
+       if (CANT_HAPPEN(comm.com_type <= I_NONE || comm.com_type > I_MAX)) {
+           pr("The goods have been eaten by a grue.");
+           return RET_OK;
+       }
+       m = sect.sct_item[comm.com_type];
        m = m + comm.com_amount;
        if (m > ITEM_MAX)
            m = ITEM_MAX;
-       sect.sct_item[ix->i_vtype] = m;
+       sect.sct_item[comm.com_type] = m;
        putsect(&sect);
        comm.com_owner = 0;
        putcomm(number_set, &comm);
-       pr("The goods have been returned to your trading post\n");
+       pr("The goods have been returned to your trading post.\n");
        return RET_OK;
     }
     if (price >= comm.com_price) {