From 6062002d1753ebf8fab356f34a338cbe2c16c2fe Mon Sep 17 00:00:00 2001 From: "admin@omencraft.com" Date: Wed, 26 Oct 2011 19:13:49 +0000 Subject: Moved GAMEMODE declaration to a single place... cPacket.h. Player can't take damage any more but can still sometimes die on spawn. Not sure why. Falling through the void does not kill you yet. git-svn-id: http://mc-server.googlecode.com/svn/trunk@17 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPlayer.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source/cPlayer.cpp') diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp index 71fa41d27..21c08fc5a 100644 --- a/source/cPlayer.cpp +++ b/source/cPlayer.cpp @@ -317,11 +317,13 @@ void cPlayer::Heal( int a_Health ) void cPlayer::TakeDamage( int a_Damage, cEntity* a_Instigator ) { - cPawn::TakeDamage( a_Damage, a_Instigator ); + if ( !(cPacket::GAMEMODE == 1) ) { + cPawn::TakeDamage( a_Damage, a_Instigator ); - cPacket_UpdateHealth Health; - Health.m_Health = m_Health; - m_ClientHandle->Send( Health ); + cPacket_UpdateHealth Health; + Health.m_Health = m_Health; + m_ClientHandle->Send( Health ); + } } void cPlayer::KilledBy( cEntity* a_Killer ) @@ -711,4 +713,4 @@ void cPlayer::SetName( const char* a_Name ) const cPlayer::GroupList & cPlayer::GetGroups() { return m_pState->Groups; -} \ No newline at end of file +} -- cgit v1.2.3