empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(VIS, SANCT, NORM, GOD, CAP, MONEY): Move from nat.h to player.h.

Browse source 
(PS_LOGIN): Unused, remove.
This commit is contained in:
Markus Armbruster 2007-07-27 17:50:09 +00:00
parent 78b7f3547c
commit c329f882a2
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/nat.h
View file

@ -109,14 +109,6 @@ struct natstr {
long nat_flags; /* nation flags */ long nat_flags; /* nation flags */
}; };
/* nstat values */
#define VIS bit(0)
#define SANCT (bit(1) | VIS)
#define NORM (bit(2) | VIS)
#define GOD (bit(3) | NORM | VIS)
#define CAP bit(6)
#define MONEY bit(7)
/* nation relation codes */ /* nation relation codes */
#define AT_WAR 0 #define AT_WAR 0
#define SITZKRIEG 1 #define SITZKRIEG 1

17
include/player.h
View file

@ -41,6 +41,14 @@
#include "queue.h" #include "queue.h"
#include "types.h" #include "types.h"
/* nstat values */
#define VIS bit(0)
#define SANCT (bit(1) | VIS)
#define NORM (bit(2) | VIS)
#define GOD (bit(3) | NORM | VIS)
#define CAP bit(6)
#define MONEY bit(7)
struct player { struct player {
struct emp_qelem queue; struct emp_qelem queue;
empth_t *proc; empth_t *proc;
@ -57,7 +65,7 @@ struct player {
char combuf[1024]; /* command input buffer, UTF-8 */ char combuf[1024]; /* command input buffer, UTF-8 */
char *argp[128]; /* arguments, ASCII */ char *argp[128]; /* arguments, ASCII */
char *condarg; /* conditional, ASCII */ char *condarg; /* conditional, ASCII */
time_t lasttime; time_t lasttime; /* when to debit minleft again */
int ncomstat; int ncomstat;
int minleft; int minleft;
int btused; int btused;
@ -67,7 +75,7 @@ struct player {
int simulation; /* e.g. budget command */ int simulation; /* e.g. budget command */
double dolcost; double dolcost;
int broke; int broke;
time_t curup; /* used in calc of minutes used */ time_t curup; /* when last input was received */
int aborted; int aborted;
int curid; /* for pr, cur. line's id, -1 none */ int curid; /* for pr, cur. line's id, -1 none */
char *map; /* pointer to in-mem map */ char *map; /* pointer to in-mem map */
@ -75,9 +83,8 @@ struct player {
}; };
#define PS_INIT 0 #define PS_INIT 0
#define PS_LOGIN 1 #define PS_PLAYING 1
#define PS_PLAYING 2 #define PS_SHUTDOWN 2
#define PS_SHUTDOWN 3
/* player flags */ /* player flags */
enum { enum {

2
src/lib/player/empmod.c
View file

@ -38,7 +38,7 @@
#include <config.h> #include <config.h>
#include "com.h" #include "com.h"
#include "nat.h" #include "player.h"
#include "prototypes.h" #include "prototypes.h"
struct cmndstr player_coms[] = { struct cmndstr player_coms[] = {