From 02cc4d9c8e76f559790bfb141ff5d8e6e5bc0e3f Mon Sep 17 00:00:00 2001
From: NoMonkey <johnmena@wildfiregames.com>
Date: Sun, 23 Jan 2005 22:21:37 +0000
Subject: [PATCH] This was SVN commit r1793.

---
 source/ps/Player.cpp | 2 +-
 source/ps/Player.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/ps/Player.cpp b/source/ps/Player.cpp
index 6477b9c00c..dbca75ba85 100755
--- a/source/ps/Player.cpp
+++ b/source/ps/Player.cpp
@@ -31,7 +31,7 @@ bool CPlayer::ValidateCommand(CNetMessage *pMsg)
 
 static bool ControllerPredicate( CEntity* entity, void* userdata )
 {
-	return( entity->m_player == userdata );
+	return( entity->GetPlayer() == userdata );
 }
 
 std::vector<HEntity>* CPlayer::GetControlledEntities()
diff --git a/source/ps/Player.h b/source/ps/Player.h
index fa04273f6b..b096ae973f 100755
--- a/source/ps/Player.h
+++ b/source/ps/Player.h
@@ -18,7 +18,7 @@ public:
 
 private:
 	CStrW m_Name;
-	uint m_PlayerID;
+	PS_uint m_PlayerID;
 	SPlayerColour m_Colour;
 	
 	UpdateCallback *m_UpdateCB;
@@ -31,7 +31,7 @@ public:
 
 	bool ValidateCommand(CNetMessage *pMsg);
 
-	inline uint GetPlayerID() const
+	inline PS_uint GetPlayerID() const
 	{	return m_PlayerID; }
 	
 	inline const CStrW &GetName() const