about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-11-30 01:47:35 +0100
committeroy <Tom_Adams@web.de>2011-11-30 01:47:35 +0100
commitdf4e11dc8257e7e15ee5a3cf52b0d8743ccb18e7 (patch)
tree0301239f357553334cdf75437ffa3ca189fbe415 /src
parent05f77f64affc2445c7e386088e97c6411664cab3 (diff)
downloadzcatch-df4e11dc8257e7e15ee5a3cf52b0d8743ccb18e7.tar.gz
zcatch-df4e11dc8257e7e15ee5a3cf52b0d8743ccb18e7.zip
fixed fixed camera position when chatting as spectator. Closes #880
Diffstat (limited to 'src')
-rw-r--r--src/game/client/components/controls.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
index 81c4d5ae..dd856413 100644
--- a/src/game/client/components/controls.cpp
+++ b/src/game/client/components/controls.cpp
@@ -209,7 +209,8 @@ void CControls::OnRender()
 
 bool CControls::OnMouseMove(float x, float y)
 {
-	if(m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_PAUSED)
+	if((m_pClient->m_Snap.m_pGameInfoObj && m_pClient->m_Snap.m_pGameInfoObj->m_GameStateFlags&GAMESTATEFLAG_PAUSED) ||
+		(m_pClient->m_Snap.m_SpecInfo.m_Active && m_pClient->m_pChat->IsActive()))
 		return false;
 
 	m_MousePos += vec2(x, y); // TODO: ugly