From 3851e7b9d92e5e03ae38d4d99f3e4834ba48f029 Mon Sep 17 00:00:00 2001 From: NoMonkey Date: Sun, 23 Jan 2005 22:38:13 +0000 Subject: [PATCH] This was SVN commit r1795. --- source/simulation/Entity.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/simulation/Entity.cpp b/source/simulation/Entity.cpp index 35a13239c7..6f68fc7667 100755 --- a/source/simulation/Entity.cpp +++ b/source/simulation/Entity.cpp @@ -88,14 +88,6 @@ CEntity::~CEntity() if( m_bounds ) delete( m_bounds ); } -void CEntity::SetPlayer(CPlayer *pPlayer) -{ - m_player=pPlayer; - - // Store the ID of the player in the associated model - m_actor->GetModel()->SetPlayerID( m_player->GetPlayerID() ); -} - void CEntity::loadBase() { if( m_actor ) @@ -148,6 +140,14 @@ void CEntity::kill() me = HEntity(); // will deallocate the entity, assuming nobody else has a reference to it } +void CEntity::SetPlayer(CPlayer *pPlayer) +{ + m_player=pPlayer; + + // Store the ID of the player in the associated model + m_actor->GetModel()->SetPlayerID( m_player->GetPlayerID() ); +} + void CEntity::updateActorTransforms() { CMatrix3D m;