about summary refs log tree commit diff
path: root/src/game/server/entities
diff options
context:
space:
mode:
authorFujnky <larsfunke1996@gmail.com>2010-06-07 16:00:01 +0200
committerFujnky <larsfunke1996@gmail.com>2010-06-07 16:00:01 +0200
commit7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16 (patch)
tree4a308559ece64a7c90328432fd3956021ffb2e3d /src/game/server/entities
parent34bd0a09b7b57fb83f7cc44ea880387538102bf4 (diff)
parent04b6abae93c809efeeb4f6b2e9d8eb80a48b1686 (diff)
downloadzcatch-7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16.tar.gz
zcatch-7cc7c8f84eba9d9c103e6cc393da9c0fab41cf16.zip
Merged with master
Diffstat (limited to 'src/game/server/entities')
-rw-r--r--src/game/server/entities/character.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/entities/character.h b/src/game/server/entities/character.h
index a1add982..bea0c002 100644
--- a/src/game/server/entities/character.h
+++ b/src/game/server/entities/character.h
@@ -57,7 +57,7 @@ public:
 	
 	void SetEmote(int Emote, int Tick);
 	
-	const bool IsAlive() { return m_Alive; }
+	bool IsAlive() const { return m_Alive; }
 	class CPlayer *GetPlayer() { return m_pPlayer; }
 	
 private: