Update copyright notice

[empserver] / src / server / marketup.c

diff --git a/src/server/marketup.c b/src/server/marketup.c
index 73d6791f0df401b779c4727a3c9321d415b369d6..e397926f393f0fb1e40467138e662207f32c9470 100644 (file)
--- a/src/server/marketup.c
+++ b/src/server/marketup.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-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,69 +19,58 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  marketup.c: Market updater thread
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2007
  */
 
-#include "options.h"
-#include "misc.h"
-#include "player.h"
-#include "keyword.h"
+#include <config.h>
+
 #include "empthread.h"
 #include "file.h"
-#include <stdio.h>
+#include "optlist.h"
+#include "player.h"
 #include "prototypes.h"
+#include "server.h"
 
 /*ARGSUSED*/
-void
-check_all_markets(argv)
-void *argv;
+static void
+market_update(void *unused)
 {
+    time_t now;
+
     player->proc = empth_self();
     player->cnum = 0;
     player->god = 1;
 
-    check_market();
-    check_trade();
-
-    ef_flush(EF_NATION);
-    ef_flush(EF_SECTOR);
-    ef_flush(EF_PLANE);
-    ef_flush(EF_SHIP);
-    ef_flush(EF_LAND);
-    ef_flush(EF_COMM);
-    ef_flush(EF_TRADE);
-
-    player_delete(player);
-    empth_exit();
+    for (;;) {
+       time(&now);
+       check_market();
+       check_trade();
+       now += 300;             /* Every 5 minutes */
+       empth_sleep(now);
+    }
     /*NOTREACHED*/
 }
 
-/*ARGSUSED*/
 void
-market_update(argv)
-void   *argv;
+market_init(void)
 {
-    time_t    now;
     struct player *dp;
-    
-    while (1) {
-       time(&now);
-/*     logerror("Checking the world markets at %s", ctime(&now));*/
-       dp = player_new(0, 0);
-       empth_create(PP_UPDATE, check_all_markets, (50*1024), 0,
-                 "MarketCheck", "Checks the world markets", dp);
-       now = now + 300; /* Every 5 minutes */
-       empth_sleep(now);
-    }
-    /*NOTREACHED*/
-}
 
+    if (!opt_MARKET)
+       return;
+    dp = player_new(-1);
+    if (!dp)
+       exit_nomem();
+    if (!empth_create(market_update, 50 * 1024, 0, "MarketUpdate", dp))
+       exit_nomem();
+}