about summary refs log tree commit diff
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-08-19 00:12:30 +0200
committeroy <Tom_Adams@web.de>2011-08-19 00:12:30 +0200
commitb1e7797b19ca15bd644a98492fc75f0bd73ae76d (patch)
tree06fca8ff376c64c25ed6f4f9c4e801bf3cb1e6ea
parent244d2bab3cf824d70b7e76b896cfe7543bdbdc7a (diff)
downloadzcatch-b1e7797b19ca15bd644a98492fc75f0bd73ae76d.tar.gz
zcatch-b1e7797b19ca15bd644a98492fc75f0bd73ae76d.zip
fixed compiling with mingw
-rw-r--r--src/base/detect.h2
-rw-r--r--src/game/client/components/menus_ingame.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/base/detect.h b/src/base/detect.h
index f9ca5779..f802b119 100644
--- a/src/base/detect.h
+++ b/src/base/detect.h
@@ -77,7 +77,7 @@
 
 
 /* use gcc endianness definitions when available */
-#if defined(__GNUC__) && !defined(__APPLE__)
+#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__MINGW32__)
 	#if defined(__FreeBSD__) || defined(__OpenBSD__)
 		#include <sys/endian.h>
 	#else
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index 1afcefe5..3a4ad6f2 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -393,7 +393,7 @@ void CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
 			continue;
 
 		int Index = m_pClient->m_Snap.m_paInfoByTeam[i]->m_ClientID;
-		if(Index == m_pClient->m_Snap.m_LocalClientID || FilterSpectators && m_pClient->m_Snap.m_paInfoByTeam[i]->m_Team == TEAM_SPECTATORS)
+		if(Index == m_pClient->m_Snap.m_LocalClientID || (FilterSpectators && m_pClient->m_Snap.m_paInfoByTeam[i]->m_Team == TEAM_SPECTATORS))
 			continue;
 		if(m_CallvoteSelectedPlayer == Index)
 			Selected = NumOptions;