client: Unbreak standalone build

[empserver] / src / server / marketup.c

diff --git a/src/server/marketup.c b/src/server/marketup.c
index 13921aeae6eddeb2a135e79a25a71ae9bd639295..a5853082a11c125bbaad76bcd064f61700225925 100644 (file)
--- a/src/server/marketup.c
+++ b/src/server/marketup.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,74 +14,60 @@
  *  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/>.
  *
  *  ---
  *
- *  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-2013
  */
 
-#include "options.h"
-#include "misc.h"
-#include "player.h"
+#include <config.h>
+
 #include "empthread.h"
-#include "file.h"
-#include "server.h"
+#include "optlist.h"
+#include "player.h"
 #include "prototypes.h"
+#include "server.h"
 
 /*ARGSUSED*/
 static void
-check_all_markets(void *unused)
+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();
-    /*NOTREACHED*/
+    for (;;) {
+       time(&now);
+       check_market();
+       check_trade();
+       now += 300;             /* Every 5 minutes */
+       empth_sleep(now);
+    }
 }
 
-/*ARGSUSED*/
 void
-market_update(void *unused)
+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);
-       if (dp) {
-           empth_create(PP_UPDATE, check_all_markets, (50 * 1024), 0,
-                        "MarketCheck", "Checks the world markets", dp);
-       } else {
-           logerror("can't create dummy player for market update");
-       }
-       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, 65536, 0, "MarketUpdate", dp))
+       exit_nomem();
 }