summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKUDr <kudr@openttd.org>2007-01-18 23:45:58 +0000
committerKUDr <kudr@openttd.org>2007-01-18 23:45:58 +0000
commit6230f9b922eecada14a5309f541b9fea746d94bf (patch)
tree3302c84de49a0fa42593d0968df7e44ce8f27d75
parentb36298e8a1687926f2cbc42835650a3aae226de8 (diff)
downloadopenttd-6230f9b922eecada14a5309f541b9fea746d94bf.tar.xz
(svn r8272) -Fix (r8038): signed/unsigned change - PlayerID is now enum (signed) and was byte so test for PlayerID validity needed to be updated (Darkvater)
-rw-r--r--src/player.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/player.h b/src/player.h
index e3329c0d1..1f91f58de 100644
--- a/src/player.h
+++ b/src/player.h
@@ -230,7 +230,7 @@ static inline byte ActivePlayerCount(void)
static inline Player* GetPlayer(PlayerID i)
{
- assert(i < (PlayerID)lengthof(_players));
+ assert(IS_INSIDE_1D(i, PLAYER_FIRST, lengthof(_players)));
return &_players[i];
}
@@ -241,7 +241,7 @@ static inline bool IsLocalPlayer(void)
static inline bool IsValidPlayer(PlayerID pi)
{
- return pi < MAX_PLAYERS;
+ return IS_INSIDE_1D(pi, PLAYER_FIRST, MAX_PLAYERS);
}
byte GetPlayerRailtypes(PlayerID p);