(svn r6771) -Codechange: Replace two macros with functions. IS_HUMAN_PLAYER and

 IS_INTERACTIVE_PLAYER

1 files changed, 10 insertions, 3 deletions

diff --git a/player.h b/player.h
index 384afe4c4..444971604 100644
--- a/player.h
+++ b/player.h
@@ -248,6 +248,16 @@ static inline bool HasRailtypeAvail(const Player *p, RailType Railtype)
 	return HASBIT(p->avail_railtypes, Railtype);
 }
 
+static inline bool IsHumanPlayer(PlayerID pi)
+{
+	return !GetPlayer(pi)->is_ai;
+}
+
+static inline bool IsInteractivePlayer(PlayerID pi)
+{
+	return pi == _local_player;
+}
+
 /* Validate functions for rail building */
 static inline bool ValParamRailtype(uint32 rail) { return HASBIT(GetPlayer(_current_player)->avail_railtypes, rail);}
 
@@ -265,9 +275,6 @@ static inline RailType GetBestRailtype(const Player* p)
 	return RAILTYPE_RAIL;
 }
 
-#define IS_HUMAN_PLAYER(p) (!GetPlayer(p)->is_ai)
-#define IS_INTERACTIVE_PLAYER(p) ((p) == _local_player)
-
 typedef struct HighScore {
 	char company[100];
 	StringID title; // NO_SAVE, has troubles with changing string-numbers.