From e53c4db866021b07baace56f999be93920cd0f19 Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 21 Jul 2005 19:36:43 +0000 Subject: (svn r2664) Remove depedency on player.h from variables.h --- player.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'player.h') diff --git a/player.h b/player.h index 43af5b361..609dc25ad 100644 --- a/player.h +++ b/player.h @@ -196,8 +196,12 @@ void AiDoGameLoop(Player *p); void UpdatePlayerMoney32(Player *p); #define FOR_ALL_PLAYERS(p) for(p=_players; p != endof(_players); p++) +extern PlayerID _current_player; + #define MAX_PLAYERS 8 VARDEF Player _players[MAX_PLAYERS]; +// NOSAVE: can be determined from player structs +VARDEF byte _player_colors[MAX_PLAYERS]; static inline Player* GetPlayer(uint i) { @@ -229,6 +233,9 @@ static inline bool HasRailtypeAvail(Player *p, RailType Railtype) return HASBIT(p->avail_railtypes, Railtype); } +/* Validate functions for rail building */ +static inline bool ValParamRailtype(uint32 rail) { return HASBIT(GetPlayer(_current_player)->avail_railtypes, rail);} + /** Returns the "best" railtype a player can build. * As the AI doesn't know what the BEST one is, we * have our own priority list here. When adding -- cgit v1.2.3-54-g00ecf