changeset 5729:aba85ecfdbb5 draft

(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)
author KUDr <KUDr@openttd.org>
date Thu, 18 Jan 2007 23:45:58 +0000
parents 12f08523ab64
children 91e44c521f66
files src/player.h
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/player.h
+++ b/src/player.h
@@ -230,7 +230,7 @@
 
 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 IsValidPlayer(PlayerID pi)
 {
-	return pi < MAX_PLAYERS;
+	return IS_INSIDE_1D(pi, PLAYER_FIRST, MAX_PLAYERS);
 }
 
 byte GetPlayerRailtypes(PlayerID p);