about summary refs log tree commit diff
path: root/src/game/client
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-01-17 13:46:59 +0100
committeroy <Tom_Adams@web.de>2011-01-17 13:46:59 +0100
commit99c6b87c1a1e6b01fd3f92e043a7100ae3b2f0d4 (patch)
tree573585be1a822228d70cc578088ea8731c589e98 /src/game/client
parent813f0797d8b47135df3c4448bf4df3272bdc12d7 (diff)
downloadzcatch-99c6b87c1a1e6b01fd3f92e043a7100ae3b2f0d4.tar.gz
zcatch-99c6b87c1a1e6b01fd3f92e043a7100ae3b2f0d4.zip
hide broadcast when motd is active. Closes #420
Diffstat (limited to 'src/game/client')
-rw-r--r--src/game/client/components/broadcast.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/client/components/broadcast.cpp b/src/game/client/components/broadcast.cpp
index 37876562..17b2d66b 100644
--- a/src/game/client/components/broadcast.cpp
+++ b/src/game/client/components/broadcast.cpp
@@ -8,6 +8,7 @@
 
 #include <game/client/gameclient.h>
 
+#include <game/client/components/motd.h>
 #include <game/client/components/scoreboard.h>
 
 #include "broadcast.h"
@@ -19,7 +20,7 @@ void CBroadcast::OnReset()
 
 void CBroadcast::OnRender()
 {
-	if(m_pClient->m_pScoreboard->Active())
+	if(m_pClient->m_pScoreboard->Active() || m_pClient->m_pMotd->IsActive())
 		return;
 
 	Graphics()->MapScreen(0, 0, 300*Graphics()->ScreenAspect(), 300);