(svn r6775) -Codechange: Use some more proper types, especially Owner and PlayerID as

 these are used intermixed often.

1 files changed, 4 insertions, 4 deletions

diff --git a/players.c b/players.c
index be8224c24..b533875ca 100644
--- a/players.c
+++ b/players.c
@@ -259,7 +259,7 @@ void UpdatePlayerMoney32(Player *p)
 	}
 }
 
-void GetNameOfOwner(PlayerID owner, TileIndex tile)
+void GetNameOfOwner(Owner owner, TileIndex tile)
 {
 	SetDParam(2, owner);
 
@@ -283,7 +283,7 @@ void GetNameOfOwner(PlayerID owner, TileIndex tile)
 
 bool CheckOwnership(PlayerID owner)
 {
-	assert(owner <= OWNER_WATER);
+	assert(owner < OWNER_END);
 
 	if (owner == _current_player) return true;
 	_error_message = STR_013B_OWNED_BY;
@@ -293,9 +293,9 @@ bool CheckOwnership(PlayerID owner)
 
 bool CheckTileOwnership(TileIndex tile)
 {
-	PlayerID owner = GetTileOwner(tile);
+	Owner owner = GetTileOwner(tile);
 
-	assert(owner <= OWNER_WATER);
+	assert(owner < OWNER_END);
 
 	if (owner == _current_player) return true;
 	_error_message = STR_013B_OWNED_BY;