Markus Armbruster
e852d458f9
Adding or removing a command to/from a test has unfortunate effects: * Before the previous commit: if the command consumes pseudorandom numbers, all subsequent users of pseudorandom numbers get different ones. This has always been a major headache. * Since the previous commit: all subsequent users of pseudorandom numbers get different ones whether the command consumes any or not. That's even worse. * If the command uses BTUs, subsequent prompts are changed. Not nearly as bad as the above, but still annoying. Create a new command __cmd to allow compensating for adding/removing commands for tests. Throw in the ability to compensate treasury changes for good measure. Three arguments: command count, BTU use, money use. Usage example: say you add a convert command to a test, and it uses 3 BTUs and $15. Then you compensate by adding "__cmd added 1 3 15" right after it. The command must not be available unless running_test_suite is on, of course. Make it require the new player command capability TESTING, and give that to all players when running_test_suite is on. The command is intentionally not documented in info. Switch running_test_suite off for info-test, to hide it (and any future TESTING commands) from info-test. Suppress the command counter increment for TESTING commands, so they can be used without upsetting pseudorandom numbers Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
104 lines
3.5 KiB
C
104 lines
3.5 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure, Markus Armbruster
|
|
*
|
|
* 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 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* ---
|
|
*
|
|
* 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.
|
|
*
|
|
* ---
|
|
*
|
|
* player.h: Definitions for player information (threads)
|
|
*
|
|
* Known contributors to this file:
|
|
* Dave Pare, 1994
|
|
* Doug Hay, 1998
|
|
* Markus Armbruster, 2005-2014
|
|
*/
|
|
|
|
#ifndef PLAYER_H
|
|
#define PLAYER_H
|
|
|
|
#include <time.h>
|
|
#include "empthread.h"
|
|
#include "misc.h"
|
|
#include "queue.h"
|
|
#include "types.h"
|
|
|
|
/* player command capabilities */
|
|
#define NONVIS bit(0) /* can execute common commands (visitors can't) */
|
|
#define SANCT bit(1) /* can execute commands available in sanctuary */
|
|
#define NORM bit(2) /* can execute active player commands */
|
|
#define GOD bit(3) /* can execute deity commands */
|
|
#define TESTING bit(4) /* can execute commands meant for test suite */
|
|
#define EXEC bit(5) /* can execute the execute command */
|
|
#define CAP bit(6) /* has capital */
|
|
#define MONEY bit(7) /* isn't broke */
|
|
|
|
enum player_sleep {
|
|
PLAYER_SLEEP_NEVER, PLAYER_SLEEP_ON_INPUT, PLAYER_SLEEP_FREELY
|
|
};
|
|
|
|
struct player {
|
|
struct emp_qelem queue;
|
|
empth_t *proc;
|
|
char hostaddr[46];
|
|
char hostname[512]; /* may be empty */
|
|
char client[128]; /* may be empty */
|
|
char userid[32]; /* may be empty */
|
|
int authenticated;
|
|
natid cnum;
|
|
int state;
|
|
int flags;
|
|
struct cmndstr *command; /* currently executing command */
|
|
struct iop *iop;
|
|
char combuf[1024]; /* command input buffer, UTF-8 */
|
|
char argbuf[1024]; /* argument buffer, ASCII */
|
|
char *argp[128]; /* arguments, ASCII, valid if command */
|
|
char *condarg; /* conditional, ASCII, valid if command */
|
|
char *comtail[128]; /* start of args in combuf[] */
|
|
time_t lasttime; /* when nat_timeused was last updated */
|
|
int btused;
|
|
int god;
|
|
int owner;
|
|
int nstat; /* command capabilities */
|
|
int simulation; /* e.g. budget command */
|
|
double dolcost;
|
|
time_t curup; /* when last input was received */
|
|
enum player_sleep may_sleep; /* when may thread sleep? */
|
|
int aborted; /* command aborted? */
|
|
int got_ctld; /* EOF cookie received? */
|
|
int recvfail; /* #recvclient() failures */
|
|
int curid; /* for pr, cur. line's id, -1 none */
|
|
char *map; /* pointer to in-mem map */
|
|
char *bmap; /* pointer to in-mem bmap */
|
|
};
|
|
|
|
#define PS_INIT 0
|
|
#define PS_PLAYING 1
|
|
#define PS_SHUTDOWN 2
|
|
|
|
/* player flags */
|
|
enum {
|
|
PF_UTF8 = bit(0), /* client wants UTF-8 */
|
|
PF_DOWN = bit(1), /* told player game is down */
|
|
PF_HOURS = bit(2) /* told player hours restriction is on */
|
|
};
|
|
|
|
#endif
|