Update copyright notice

[empserver] / src / lib / player / dispatch.c

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index 5b2e6ee768f87e39cd36f05b98453f1abeb30f3f..4242cea137c45c5586b383bfa7c466aaf813c6d4 100644 (file)
--- a/src/lib/player/dispatch.c
+++ b/src/lib/player/dispatch.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,14 +29,14 @@
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1998
- *     Markus Armbruster, 2007-2012
+ *     Markus Armbruster, 2007-2014
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "com.h"
 #include "empio.h"
-#include "file.h"
 #include "journal.h"
 #include "match.h"
 #include "misc.h"
@@ -46,11 +46,17 @@
 #include "prototypes.h"
 #include "server.h"
 
+/*
+ * Last command's PRNG seed.
+ * Only used when running_test_suite.
+ */
+int test_suite_prng_seed;
+
 /*
  * Execute command named by player->argp[0].
- * BUF is the raw UTF-8 command line.  It should have been passed to
+ * @buf is the raw UTF-8 command line.  It should have been passed to
  * parse() to set up player->argp.
- * If REDIR is not null, it's the command's redirection, in UTF-8.
+ * If @redir is not null, it's the command's redirection, in UTF-8.
  * Return -1 if the command is not unique or doesn't exist, else 0.
  */
 int
@@ -71,12 +77,13 @@ dispatch(char *buf, char *redir)
        return -1;
     }
     command = &player_coms[cmd];
+
     np = getnatp(player->cnum);
     if (np->nat_btu < command->c_cost && command->c_cost > 0) {
        if (player->god || opt_BLITZ)
            np->nat_btu = max_btus;
        else {
-           pr("You don't have the BTU's, bozo\n");
+           pr("You don't have the BTUs, bozo\n");
            return 0;
        }
     }
@@ -88,6 +95,18 @@ dispatch(char *buf, char *redir)
        ? PLAYER_SLEEP_ON_INPUT : PLAYER_SLEEP_FREELY;
     player->command = command;
     empth_rwlock_rdlock(update_lock);
+
+    /*
+     * When running the test suite, reseed PRNG for each command with
+     * a counter, to keep results stable even when the number of PRNs
+     * consumed changes.
+     * Tests can adjust the counter with "__cmd added ...", to
+     * keep the results stable when commands are inserted or deleted.
+     */
+    test_suite_prng_seed += !(command->c_permit & TESTING);
+    if (running_test_suite)
+       seed_prng(test_suite_prng_seed);
+
     if (redir) {
        prredir(redir);
        uprnf(buf);
@@ -109,6 +128,7 @@ dispatch(char *buf, char *redir)
        CANT_REACH();
        break;
     }
+
     empth_rwlock_unlock(update_lock);
     player->command = NULL;
     if (player->may_sleep != PLAYER_SLEEP_NEVER || !io_eof(player->iop))