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

(CHE_MAX): Don't define twice, define once in a header.

Browse source 
(get_che_cnum, set_che_cnum, get_che_value, set_che_value): Remove
redundant definitions.
This commit is contained in:
Markus Armbruster 2004-03-01 13:32:06 +00:00
parent 13797a2ba2
commit 98b392d72c
3 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/var.h
View file

@ -95,6 +95,7 @@
#define V_FALLOUT V_COND(C_FALLOUT) #define V_FALLOUT V_COND(C_FALLOUT)
/* should this be here?? */ /* should this be here?? */
#define CHE_MAX 255
#define get_che_cnum(x) ((x) >> 8) #define get_che_cnum(x) ((x) >> 8)
#define set_che_cnum(x, cn) ((x) = ((x) & 0xff) | ((cn) << 8)) #define set_che_cnum(x, cn) ((x) = ((x) & 0xff) | ((cn) << 8))
#define get_che_value(x) ((x) & 0xff) #define get_che_value(x) ((x) & 0xff)

2
src/lib/subs/takeover.c
View file

@ -45,8 +45,6 @@
#include "prototypes.h" #include "prototypes.h"
#include "optlist.h" #include "optlist.h"
#define CHE_MAX 255
void void
takeover(register struct sctstr *sp, natid newown) takeover(register struct sctstr *sp, natid newown)
{ {

7
src/lib/update/revolt.c
View file

@ -52,13 +52,6 @@
static void take_casualties(struct sctstr *, int); static void take_casualties(struct sctstr *, int);
#define get_che_cnum(x) ((x) >> 8)
#define set_che_cnum(x, cn) ((x) = ((x) & 0xff) | ((cn) << 8))
#define get_che_value(x) ((x) & 0xff)
#define set_che_value(x, n) ((x) = ((x) & 0xff00) | (n))
#define CHE_MAX 255
void void
revolt(struct sctstr *sp) revolt(struct sctstr *sp)
{ {