Update copyright notice

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

diff --git a/src/lib/commands/mark.c b/src/lib/commands/mark.c
index 6bb38c143b4b87f37406d8813315bada0d53bc76..a1a777fabd61856a07e0fa5630f8733b320553ba 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-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2018, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -30,6 +30,7 @@
  *     Dave Pare, 1986
  *     Pat Loney, 1992
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2004-2013
  */
 
 #include <config.h>
@@ -70,15 +71,14 @@ mark(void)
 static void
 pr_mark(struct comstr *comm)
 {
-    time_t now;
-    double tleft;
+    time_t now, tleft;
 
     (void)time(&now);
-    tleft = MARK_DELAY / 3600.0 - (now - comm->com_markettime) / 3600.0;
-    if (tleft < 0.0)
-       tleft = 0.0;
+    tleft = comm->com_markettime + MARK_DELAY - now;
+    if (tleft < 0)
+       tleft = 0;
     pr(" %3d  $%12.2f  %2d  %5.2f hrs  (%3d)   %c    %6d  ",
-       comm->com_uid, comm->com_price, comm->com_maxbidder, tleft,
+       comm->com_uid, comm->com_price, comm->com_maxbidder, tleft / 3600.0,
        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));
@@ -95,7 +95,7 @@ display_mark(i_type only_itype, int only_cheapest)
     int cheapest_items[I_MAX + 1];
     i_type i;
 
-    /* Execute trades so report lists only lots that are still available.  */
+    /* Execute trades so report lists only lots that are still available. */
     check_market();
     check_trade();