Fix dangerous expressions

Author: qaisjp

Client/mods/deathmatch/logic/CClientEntity.h

@@ -37,7 +37,7 @@ class CClientManager;
 #define IS_PROJECTILE(entity) ((entity)->GetType()==CCLIENTPROJECTILE)
 #define IS_GUI(entity) ((entity)->GetType()==CCLIENTGUI)
 #define IS_IFP(entity) ((entity)->GetType()==CCLIENTIFP)
-#define CHECK_CGUI(entity,type) (((CClientGUIElement*)entity)->GetCGUIElement()->GetType()==type)
+#define CHECK_CGUI(entity,type) (((CClientGUIElement*)entity)->GetCGUIElement()->GetType()==(type))
 
 enum eClientEntityType
 {

Client/mods/deathmatch/logic/CNametags.cpp

@@ -23,7 +23,7 @@ using std::list;
 #define MAX_ALPHA                   180.0f // max value is 255
 
 #define DEFAULT_VIEW_RANGE          45.0f
-#define DEFAULT_VIEW_RANGE_EXP      DEFAULT_VIEW_RANGE*DEFAULT_VIEW_RANGE
+#define DEFAULT_VIEW_RANGE_EXP      ((DEFAULT_VIEW_RANGE)*(DEFAULT_VIEW_RANGE))
 
 CNametags::CNametags(CClientManager* pManager)
 {

Client/sdk/gui/CGUI.h

@@ -45,7 +45,7 @@ class CGUI;
 #define CGUI_ICON_SERVER_PASSWORD       "cgui\\images\\locked.png"
 #define CGUI_GetMaxTextExtent(...) GetMaxTextExtent(__VA_ARGS__, SString())
 
-#define CHECK_CHANNEL(channel) assert ( channel >= 0 && channel < INPUT_CHANNEL_COUNT )
+#define CHECK_CHANNEL(channel) assert ( (channel) >= 0 && (channel) < INPUT_CHANNEL_COUNT )
 
 class CGUI
 {