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

Tidy up whitespace in macro replacement lists

Browse source
This commit is contained in:
Markus Armbruster 2010-05-23 17:49:33 +02:00
parent 25d29c8f8f
commit b1a36aebf7
12 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/combat.h
View file

@ -61,12 +61,12 @@ struct combat {
}; };
/* Types of combat for use by attack routines */ /* Types of combat for use by attack routines */
#define A_DEFEND 0 #define A_DEFEND 0
#define A_ATTACK 1 #define A_ATTACK 1
#define A_ASSAULT 2 #define A_ASSAULT 2
#define A_PARA 3 #define A_PARA 3
#define A_BOARD 4 #define A_BOARD 4
#define A_LBOARD 5 #define A_LBOARD 5
/* src/lib/subs/attsub.c */ /* src/lib/subs/attsub.c */
extern double att_combat_eff(struct combat *); extern double att_combat_eff(struct combat *);

6
include/land.h
View file

@ -118,9 +118,9 @@ struct lchrstr {
#define L_RADAR bit(7) /* radar unit */ #define L_RADAR bit(7) /* radar unit */
#define L_ASSAULT bit(8) /* can assault */ #define L_ASSAULT bit(8) /* can assault */
#define L_FLAK bit(9) /* flak unit */ #define L_FLAK bit(9) /* flak unit */
#define L_SPY bit(10) /* spy unit - way cool */ #define L_SPY bit(10) /* spy unit - way cool */
#define L_TRAIN bit(11) /* train unit - neato */ #define L_TRAIN bit(11) /* train unit - neato */
#define L_HEAVY bit(12) /* heavy unit - can't go on trains */ #define L_HEAVY bit(12) /* heavy unit - can't go on trains */
/* Work required for building 100% */ /* Work required for building 100% */
#define LND_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm)) #define LND_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))

2
include/match.h
View file

@ -37,7 +37,7 @@
#include <stddef.h> #include <stddef.h>
/* returned by stmtch() and comtch() */ /* returned by stmtch() and comtch() */
#define M_IGNORE -3 #define M_IGNORE -3
#define M_NOTUNIQUE -2 #define M_NOTUNIQUE -2
#define M_NOTFOUND -1 #define M_NOTFOUND -1
/*#define M_INDEX [0...N-1] */ /*#define M_INDEX [0...N-1] */

10
include/nat.h
View file

@ -120,11 +120,11 @@ struct natstr {
/* nation relation codes */ /* nation relation codes */
#define AT_WAR 0 #define AT_WAR 0
#define SITZKRIEG 1 #define SITZKRIEG 1
#define MOBILIZATION 2 #define MOBILIZATION 2
#define HOSTILE 3 #define HOSTILE 3
#define NEUTRAL 4 #define NEUTRAL 4
#define FRIENDLY 5 #define FRIENDLY 5
#define ALLIED 6 #define ALLIED 6
/* nation reject codes */ /* nation reject codes */
@ -192,7 +192,7 @@ extern int grant_btus(struct natstr *, int);
#define NF_BEEP bit(2) /* Make beeping sounds when appropriate */ #define NF_BEEP bit(2) /* Make beeping sounds when appropriate */
#define NF_COASTWATCH bit(3) /* Turn auto-coastwatch on */ #define NF_COASTWATCH bit(3) /* Turn auto-coastwatch on */
#define NF_SONAR bit(4) /* Turn auto-sonar on */ #define NF_SONAR bit(4) /* Turn auto-sonar on */
#define NF_TECHLISTS bit(5) /* Sort lists by tech not type */ #define NF_TECHLISTS bit(5) /* Sort lists by tech not type */
#define NF_SACKED bit(6) /* Capital was sacked, and hasn't been reset yet */ #define NF_SACKED bit(6) /* Capital was sacked, and hasn't been reset yet */
#endif #endif

58
include/news.h
View file

@ -108,7 +108,7 @@ struct rptstr {
#define N_AIDS 43 #define N_AIDS 43
#define N_HURTS 44 #define N_HURTS 44
#define N_TAKE 45 #define N_TAKE 45
#define N_NUKE_STOP 46 #define N_NUKE_STOP 46
#define N_SCT_MISS 47 #define N_SCT_MISS 47
#define N_SHP_MISS 48 #define N_SHP_MISS 48
#define N_TRADE 49 #define N_TRADE 49
@ -122,19 +122,19 @@ struct rptstr {
#define N_FIRE_F_ATTACK 57 #define N_FIRE_F_ATTACK 57
#define N_FIRE_L_ATTACK 58 #define N_FIRE_L_ATTACK 58
#define N_FIRE_S_ATTACK 59 #define N_FIRE_S_ATTACK 59
#define N_SACK_CAP 60 #define N_SACK_CAP 60
#define N_UP_FRIENDLY 61 #define N_UP_FRIENDLY 61
#define N_DOWN_FRIENDLY 62 #define N_DOWN_FRIENDLY 62
#define N_UP_NEUTRAL 63 #define N_UP_NEUTRAL 63
#define N_DOWN_NEUTRAL 64 #define N_DOWN_NEUTRAL 64
#define N_UP_HOSTILE 65 #define N_UP_HOSTILE 65
#define N_DOWN_HOSTILE 66 #define N_DOWN_HOSTILE 66
#define N_SCT_SMISS 67 #define N_SCT_SMISS 67
#define N_SHP_SMISS 68 #define N_SHP_SMISS 68
#define N_START_COL 69 #define N_START_COL 69
#define N_NUKE_SSTOP 70 #define N_NUKE_SSTOP 70
#define N_LND_MISS 71 #define N_LND_MISS 71
#define N_LND_SMISS 72 #define N_LND_SMISS 72
#define N_AWON_SECT 73 #define N_AWON_SECT 73
#define N_PWON_SECT 74 #define N_PWON_SECT 74
#define N_PARA_UNOCC 75 #define N_PARA_UNOCC 75
@ -142,23 +142,23 @@ struct rptstr {
#define N_PLOSE_SCT 77 #define N_PLOSE_SCT 77
/* unused 78 */ /* unused 78 */
/* unused 79 */ /* unused 79 */
#define N_WELCH_DEAL 80 #define N_WELCH_DEAL 80
#define N_LND_LOSE 81 #define N_LND_LOSE 81
#define N_BOARD_LAND 82 #define N_BOARD_LAND 82
#define N_MAX_VERB 82 #define N_MAX_VERB 82
#define N_NOTUSED 0 #define N_NOTUSED 0
#define N_FOR 1 #define N_FOR 1
#define N_FRONT 2 #define N_FRONT 2
#define N_SEA 3 #define N_SEA 3
#define N_SKY 4 #define N_SKY 4
#define N_MISS 5 #define N_MISS 5
#define N_ARTY 6 #define N_ARTY 6
#define N_ECON 7 #define N_ECON 7
#define N_COLONY 8 #define N_COLONY 8
#define N_HOME 9 #define N_HOME 9
#define N_SPY 10 #define N_SPY 10
#define N_TELE 11 #define N_TELE 11
#define N_MAX_PAGE 11 #define N_MAX_PAGE 11
#define getnews(n, p) ef_read(EF_NEWS, (n), (p)) #define getnews(n, p) ef_read(EF_NEWS, (n), (p))

4
include/plane.h
View file

@ -106,9 +106,9 @@ struct plchrstr {
#define P_S bit(7) /* Spy ability */ #define P_S bit(7) /* Spy ability */
#define P_I bit(8) /* Imaging ability (advanced spying) */ #define P_I bit(8) /* Imaging ability (advanced spying) */
#define P_O bit(9) /* Orbital ability (a satellite) */ #define P_O bit(9) /* Orbital ability (a satellite) */
/* unused bit(10) */ /* unused bit(10) */
#define P_N bit(11) /* Nuclear RV interceptor (abm) */ #define P_N bit(11) /* Nuclear RV interceptor (abm) */
/* unused bit(12) */ /* unused bit(12) */
#define P_E bit(13) /* extra light */ #define P_E bit(13) /* extra light */
#define P_K bit(14) /* chopper */ #define P_K bit(14) /* chopper */
#define P_A bit(15) /* ASW (Anti-Sub Warfare) */ #define P_A bit(15) /* ASW (Anti-Sub Warfare) */

4
include/proto.h
View file

@ -57,7 +57,7 @@
#define C_BADCMD 0xB #define C_BADCMD 0xB
#define C_EXECUTE 0xC #define C_EXECUTE 0xC
#define C_FLASH 0xD #define C_FLASH 0xD
#define C_INFORM 0xE #define C_INFORM 0xE
#define C_LAST 0xE #define C_LAST 0xE
#endif #endif

18
include/sect.h
View file

@ -156,10 +156,10 @@ struct dchrstr {
#define SCT_BANK 29 /* financial */ #define SCT_BANK 29 /* financial */
#define SCT_REFINE 30 /* refinery */ #define SCT_REFINE 30 /* refinery */
#define SCT_ENLIST 31 /* enlistment center */ #define SCT_ENLIST 31 /* enlistment center */
#define SCT_PLAINS 32 /* plains sector */ #define SCT_PLAINS 32 /* plains sector */
#define SCT_BTOWER 33 /* Bridge tower */ #define SCT_BTOWER 33 /* Bridge tower */
#define SCT_TYPE_MAX 38 #define SCT_TYPE_MAX 38
#define getsect(x, y, p) ef_read(EF_SECTOR, sctoff((x), (y)), (p)) #define getsect(x, y, p) ef_read(EF_SECTOR, sctoff((x), (y)), (p))
#define putsect(p) ef_write(EF_SECTOR, (p)->sct_uid, (p)) #define putsect(p) ef_write(EF_SECTOR, (p)->sct_uid, (p))
@ -196,13 +196,13 @@ extern struct dchrstr dchr[SCT_TYPE_MAX + 2];
#define SCT_LANDMINES(sp) \ #define SCT_LANDMINES(sp) \
(SCT_MINES_ARE_SEAMINES((sp)) ? 0 : (sp)->sct_mines) (SCT_MINES_ARE_SEAMINES((sp)) ? 0 : (sp)->sct_mines)
#define MOB_MOVE 0 #define MOB_MOVE 0
#define MOB_MARCH 1 #define MOB_MARCH 1
#define MOB_RAIL 2 #define MOB_RAIL 2
#define INT_ROAD 0 #define INT_ROAD 0
#define INT_RAIL 1 #define INT_RAIL 1
#define INT_DEF 2 #define INT_DEF 2
/* Sector flags */ /* Sector flags */
#define MOVE_IN_PROGRESS bit(0) /* move in progress */ #define MOVE_IN_PROGRESS bit(0) /* move in progress */

12
include/ship.h
View file

@ -136,17 +136,17 @@ struct mchrstr {
#define M_MINE bit(7) /* drop mines */ #define M_MINE bit(7) /* drop mines */
#define M_SWEEP bit(8) /* clean up the mines */ #define M_SWEEP bit(8) /* clean up the mines */
#define M_SUB bit(9) /* a submarine */ #define M_SUB bit(9) /* a submarine */
/* unused bit(10) */ /* unused bit(10) */
#define M_LAND bit(11) /* allows full landing ability */ #define M_LAND bit(11) /* allows full landing ability */
#define M_SUBT bit(12) /* allows torping of other subs */ #define M_SUBT bit(12) /* allows torping of other subs */
#define M_TRADE bit(13) /* is a trade ship */ #define M_TRADE bit(13) /* is a trade ship */
#define M_SEMILAND bit(14) /* can land 1/4 */ #define M_SEMILAND bit(14) /* can land 1/4 */
/* unused bit(15) */ /* unused bit(15) */
/* unused bit(16) */ /* unused bit(16) */
/* unused bit(17) */ /* unused bit(17) */
#define M_SUPPLY bit(18) /* Can supply units/sects/ships */ #define M_SUPPLY bit(18) /* Can supply units/sects/ships */
#define M_CANAL bit(19) /* Can navigate a canal (BIG CITY) */ #define M_CANAL bit(19) /* Can navigate a canal (BIG CITY) */
#define M_ANTIMISSILE bit(20) /* Shoot down missile */ #define M_ANTIMISSILE bit(20) /* Shoot down missile */
#define getship(n, p) ef_read(EF_SHIP, (n), (p)) #define getship(n, p) ef_read(EF_SHIP, (n), (p))
#define putship(n, p) ef_write(EF_SHIP, (n), (p)) #define putship(n, p) ef_write(EF_SHIP, (n), (p))

2
include/tel.h
View file

@ -44,7 +44,7 @@
#define TEL_ANNOUNCE 1 /* announcement */ #define TEL_ANNOUNCE 1 /* announcement */
#define TEL_BULLETIN 2 /* bulletin */ #define TEL_BULLETIN 2 /* bulletin */
#define TEL_UPDATE 3 /* update message */ #define TEL_UPDATE 3 /* update message */
#define TEL_LAST 3 #define TEL_LAST 3
#define TEL_SECONDS 5 /* how many seconds before starting a new telegram */ #define TEL_SECONDS 5 /* how many seconds before starting a new telegram */

4
include/treaty.h
View file

@ -67,9 +67,9 @@ struct trtstr {
#define NEWSHP bit(5) /* no new ships */ #define NEWSHP bit(5) /* no new ships */
#define NEWNUK bit(6) /* no new nuclear weapons */ #define NEWNUK bit(6) /* no new nuclear weapons */
#define NEWPLN bit(7) /* no new planes */ #define NEWPLN bit(7) /* no new planes */
#define NEWLND bit(8) /* no new land units */ #define NEWLND bit(8) /* no new land units */
#define TRTENL bit(9) /* no enlistment */ #define TRTENL bit(9) /* no enlistment */
#define SUBFIR bit(10) /* no depth-charging submarines */ #define SUBFIR bit(10) /* no depth-charging submarines */
#define gettre(n, p) ef_read(EF_TREATY, (n), (p)) #define gettre(n, p) ef_read(EF_TREATY, (n), (p))
#define puttre(n, p) ef_write(EF_TREATY, (n), (p)) #define puttre(n, p) ef_write(EF_TREATY, (n), (p))

4
src/util/fairland.c
View file

@ -55,7 +55,7 @@ static int quiet = 0;
#define FERT_MAX 56 #define FERT_MAX 56
/* raise OIL_MAX for more oil */ /* raise OIL_MAX for more oil */
#define OIL_MAX 33 #define OIL_MAX 33
/* lower IRON_MIN for more iron */ /* lower IRON_MIN for more iron */
#define IRON_MIN 22 #define IRON_MIN 22
@ -103,7 +103,7 @@ static int DISTINCT_ISLANDS = 1;
static char *program_name; static char *program_name;
#define STABLE_CYCLE 4 /* stability required for perterbed capitals */ #define STABLE_CYCLE 4 /* stability required for perterbed capitals */
#define INFINITY 999 /* a number which means "BIG" */ #define INFINITY 999 /* a number which means "BIG" */
/* these defines prevent infinite loops: /* these defines prevent infinite loops:
*/ */