From 1758240e7132b812e55da1eb2325ff559d268a85 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sun, 11 Aug 2013 18:48:06 +0200 Subject: [PATCH] Fix utils/vbsp parentheses warnings. --- mp/src/utils/vbsp/portals.cpp | 4 ++-- mp/src/utils/vbsp/textures.cpp | 2 +- sp/src/utils/vbsp/portals.cpp | 4 ++-- sp/src/utils/vbsp/textures.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mp/src/utils/vbsp/portals.cpp b/mp/src/utils/vbsp/portals.cpp index ec2a26950..e1b494e28 100644 --- a/mp/src/utils/vbsp/portals.cpp +++ b/mp/src/utils/vbsp/portals.cpp @@ -1178,8 +1178,8 @@ void FindPortalsLeadingToArea_R( if( !p->nodes[0]->occupied || !p->nodes[1]->occupied ) continue; - if( p->nodes[1]->area == iDestArea && p->nodes[0]->area == iSrcArea || - p->nodes[0]->area == iDestArea && p->nodes[1]->area == iSrcArea ) + if( (p->nodes[1]->area == iDestArea && p->nodes[0]->area == iSrcArea) || + (p->nodes[0]->area == iDestArea && p->nodes[1]->area == iSrcArea) ) { // Make sure the plane normals point the same way. plane_t *pMapPlane = &g_MainMap->mapplanes[p->onnode->planenum]; diff --git a/mp/src/utils/vbsp/textures.cpp b/mp/src/utils/vbsp/textures.cpp index fc2034eb9..aa2e3bf82 100644 --- a/mp/src/utils/vbsp/textures.cpp +++ b/mp/src/utils/vbsp/textures.cpp @@ -251,7 +251,7 @@ int FindMiptex (const char *name) g_bHasWater = true; } const char *pShaderName = GetMaterialShaderName(matID); - if ( !bKeepLighting && !Q_strncasecmp( pShaderName, "water", 5 ) || !Q_strncasecmp( pShaderName, "UnlitGeneric", 12 ) ) + if ( (!bKeepLighting && !Q_strncasecmp( pShaderName, "water", 5 )) || !Q_strncasecmp( pShaderName, "UnlitGeneric", 12 ) ) { //if ( !(textureref[i].flags & SURF_NOLIGHT) ) // Warning("Forcing lit materal %s to nolight\n", name ); diff --git a/sp/src/utils/vbsp/portals.cpp b/sp/src/utils/vbsp/portals.cpp index ec2a26950..e1b494e28 100644 --- a/sp/src/utils/vbsp/portals.cpp +++ b/sp/src/utils/vbsp/portals.cpp @@ -1178,8 +1178,8 @@ void FindPortalsLeadingToArea_R( if( !p->nodes[0]->occupied || !p->nodes[1]->occupied ) continue; - if( p->nodes[1]->area == iDestArea && p->nodes[0]->area == iSrcArea || - p->nodes[0]->area == iDestArea && p->nodes[1]->area == iSrcArea ) + if( (p->nodes[1]->area == iDestArea && p->nodes[0]->area == iSrcArea) || + (p->nodes[0]->area == iDestArea && p->nodes[1]->area == iSrcArea) ) { // Make sure the plane normals point the same way. plane_t *pMapPlane = &g_MainMap->mapplanes[p->onnode->planenum]; diff --git a/sp/src/utils/vbsp/textures.cpp b/sp/src/utils/vbsp/textures.cpp index fc2034eb9..aa2e3bf82 100644 --- a/sp/src/utils/vbsp/textures.cpp +++ b/sp/src/utils/vbsp/textures.cpp @@ -251,7 +251,7 @@ int FindMiptex (const char *name) g_bHasWater = true; } const char *pShaderName = GetMaterialShaderName(matID); - if ( !bKeepLighting && !Q_strncasecmp( pShaderName, "water", 5 ) || !Q_strncasecmp( pShaderName, "UnlitGeneric", 12 ) ) + if ( (!bKeepLighting && !Q_strncasecmp( pShaderName, "water", 5 )) || !Q_strncasecmp( pShaderName, "UnlitGeneric", 12 ) ) { //if ( !(textureref[i].flags & SURF_NOLIGHT) ) // Warning("Forcing lit materal %s to nolight\n", name );