Update copyright notice

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

diff --git a/src/lib/commands/mark.c b/src/lib/commands/mark.c
index 6cf75e4c8a84ec413070f58f2d39403baa0c8a98..742f02e0fd2b456d87915d5c1f76ece4f900417f 100644 (file)
--- a/src/lib/commands/mark.c
+++ b/src/lib/commands/mark.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,28 +19,25 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  mark.c: Display report for commodities
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Pat Loney, 1992
  *     Steve McClure, 1996
  */
 
-#include "misc.h"
-#include "nat.h"
-#include "var.h"
-#include "item.h"
-#include "commodity.h"
-#include "player.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "commodity.h"
+#include "item.h"
 #include "optlist.h"
 
 int
@@ -65,7 +62,7 @@ mark(void)
            ip = item_by_name(p);
            if (!ip)
                return RET_SYN;
-           return display_mark(ip->i_vtype, 0);
+           return display_mark(ip->i_uid, 0);
        }
     }
     return display_mark(I_NONE, 1);
@@ -82,24 +79,22 @@ pr_mark(struct comstr *comm)
     if (tleft < 0.0)
        tleft = 0.0;
     pr(" %3d  $%12.2f  %2d  %5.2f hrs  (%3d)   %c    %6d  ",
-       comm->com_uid,
-       comm->com_price,
-       comm->com_maxbidder,
-       tleft, comm->com_owner, ichr[comm->com_type].i_mnem, comm->com_amount);
+       comm->com_uid, comm->com_price, comm->com_maxbidder, tleft,
+       comm->com_owner, ichr[comm->com_type].i_mnem, comm->com_amount);
     if (comm->com_owner == player->cnum || player->god)
        pr("%s", xyas(comm->sell_x, comm->sell_y, player->cnum));
     pr("\n");
 }
 
 int
-display_mark(int only_itype, int only_cheapest)
+display_mark(i_type only_itype, int only_cheapest)
 {
     struct comstr comm;
     struct comstr comm2;
     int sellers = 0;
     int cnt = 0;
     int cheapest_items[I_MAX + 1];
-    int i;
+    i_type i;
 
     /* Execute trades so report lists only lots that are still available.  */
     check_market();
@@ -111,12 +106,12 @@ display_mark(int only_itype, int only_cheapest)
     pr(" ---  -------------  --  ---------  -----  ----  ------  ------\n");
 
     if (only_cheapest) {
-       for (i = 0; i < I_MAX + 1; i++)
+       for (i = I_NONE + 1; i <= I_MAX; i++)
            cheapest_items[i] = -1;
        for (sellers = 0; getcomm(sellers, &comm); sellers++) {
            if (comm.com_owner == 0)
                continue;
-           if (CANT_HAPPEN((unsigned)comm.com_type > I_MAX))
+           if (CANT_HAPPEN(comm.com_type <= I_NONE || comm.com_type > I_MAX))
                continue;
            if (cheapest_items[comm.com_type] != -1) {
                getcomm(cheapest_items[comm.com_type], &comm2);
@@ -128,7 +123,7 @@ display_mark(int only_itype, int only_cheapest)
            }
        }
        CANT_HAPPEN(only_itype != I_NONE); /* not implemented */
-       for (i = 0; i < I_MAX + 1; i++) {
+       for (i = I_NONE + 1; i <= I_MAX; i++) {
            if (cheapest_items[i] == -1)
                continue;
            getcomm(cheapest_items[i], &comm);