diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index ae10449c6..9fe58719b 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -322,7 +322,7 @@ void gltexapplyprops(void) continue; } - int32_t const filter = pth->flags & PTH_FORCEFILTER ? TEXFILTER_ON : -1; + int32_t const filter = (pth->flags & PTH_FORCEFILTER) ? TEXFILTER_ON : -1; bind_2d_texture(pth->glpic, filter); @@ -350,7 +350,7 @@ void gltexapplyprops(void) { if (!sk->texid[j]) continue; - bind_2d_texture(sk->texid[j], sk->flags & HICR_FORCEFILTER ? TEXFILTER_ON : -1); + bind_2d_texture(sk->texid[j], (sk->flags & HICR_FORCEFILTER) ? TEXFILTER_ON : -1); } } } @@ -773,7 +773,7 @@ void polymost_bindTexture(GLenum target, uint32_t textureID) } } -static void polymost_bindPth(pthtyp *pPth) +static void polymost_bindPth(pthtyp const * const pPth) { Bassert(pPth); @@ -2606,7 +2606,7 @@ int32_t gloadtile_hi(int32_t dapic,int32_t dapalnum, int32_t facen, hicreplctyp pth->scale.y = (float)tsiz.y / (float)tilesiz[dapic].y; } - polymost_setuptexture(dameth, hicr->flags & HICR_FORCEFILTER ? TEXFILTER_ON : -1); + polymost_setuptexture(dameth, (hicr->flags & HICR_FORCEFILTER) ? TEXFILTER_ON : -1); if (tsiz.x>>r_downsize <= tilesiz[dapic].x || tsiz.y>>r_downsize <= tilesiz[dapic].y) hicr->flags |= HICR_ARTIMMUNITY; @@ -2616,7 +2616,7 @@ int32_t gloadtile_hi(int32_t dapic,int32_t dapalnum, int32_t facen, hicreplctyp pth->flags = TO_PTH_CLAMPED(dameth) | TO_PTH_NOTRANSFIX(dameth) | PTH_HIGHTILE | ((facen>0) * PTH_SKYBOX) | (hasalpha ? PTH_HASALPHA : 0) | - (hicr->flags & HICR_FORCEFILTER ? PTH_FORCEFILTER : 0); + ((hicr->flags & HICR_FORCEFILTER) ? PTH_FORCEFILTER : 0); pth->skyface = facen; pth->hicr = hicr; @@ -2633,7 +2633,7 @@ int32_t gloadtile_hi(int32_t dapic,int32_t dapalnum, int32_t facen, hicreplctyp // handle nodownsize: cachead.flags = nonpow2 * CACHEAD_NONPOW2 | (hasalpha ? CACHEAD_HASALPHA : 0) | - (hicr->flags & (HICR_NODOWNSIZE|HICR_ARTIMMUNITY) ? CACHEAD_NODOWNSIZE : 0); + ((hicr->flags & (HICR_NODOWNSIZE|HICR_ARTIMMUNITY)) ? CACHEAD_NODOWNSIZE : 0); /// OSD_Printf("Caching \"%s\"\n", fn); texcache_writetex_fromdriver(texcacheid, &cachead); @@ -7482,7 +7482,7 @@ void polymost_fillpolygon(int32_t npoints) if (gloy1 != -1) polymostSet2dView(); //disables blending, texturing, and depth testing glEnable(GL_ALPHA_TEST); glEnable(GL_TEXTURE_2D); - pthtyp *pth = our_texcache_fetch(DAMETH_NOMASK | (videoGetRenderMode() == REND_POLYMOST && r_useindexedcolortextures ? PTH_INDEXED : 0)); + pthtyp const * const pth = our_texcache_fetch(DAMETH_NOMASK | (videoGetRenderMode() == REND_POLYMOST && r_useindexedcolortextures ? PTH_INDEXED : 0)); if (pth) { @@ -7998,7 +7998,7 @@ void polymost_initosdfuncs(void) }; for (i=0; i<ARRAY_SIZE(cvars_polymost); i++) - OSD_RegisterCvar(&cvars_polymost[i], cvars_polymost[i].flags & CVAR_FUNCPTR ? osdcmd_cvar_set_polymost : osdcmd_cvar_set); + OSD_RegisterCvar(&cvars_polymost[i], (cvars_polymost[i].flags & CVAR_FUNCPTR) ? osdcmd_cvar_set_polymost : osdcmd_cvar_set); } void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype) diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index 469e68aee..62a4eb7cd 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -1796,7 +1796,7 @@ void Menu_Init(void) if (validmode[i].xdim == resolution[j].xdim && validmode[i].ydim == resolution[j].ydim) { resolution[j].flags |= validmode[i].fs ? RES_FS : RES_WIN; - Bsnprintf(resolution[j].name, MAXRESOLUTIONSTRINGLENGTH, "%d x %d%s", resolution[j].xdim, resolution[j].ydim, resolution[j].flags & RES_FS ? "" : "Win"); + Bsnprintf(resolution[j].name, MAXRESOLUTIONSTRINGLENGTH, "%d x %d%s", resolution[j].xdim, resolution[j].ydim, (resolution[j].flags & RES_FS) ? "" : "Win"); MEOSN_VIDEOSETUP_RESOLUTION[j] = resolution[j].name; if (validmode[i].bpp > resolution[j].bppmax) resolution[j].bppmax = validmode[i].bpp; @@ -1810,7 +1810,7 @@ void Menu_Init(void) resolution[j].ydim = validmode[i].ydim; resolution[j].bppmax = validmode[i].bpp; resolution[j].flags = validmode[i].fs ? RES_FS : RES_WIN; - Bsnprintf(resolution[j].name, MAXRESOLUTIONSTRINGLENGTH, "%d x %d%s", resolution[j].xdim, resolution[j].ydim, resolution[j].flags & RES_FS ? "" : "Win"); + Bsnprintf(resolution[j].name, MAXRESOLUTIONSTRINGLENGTH, "%d x %d%s", resolution[j].xdim, resolution[j].ydim, (resolution[j].flags & RES_FS) ? "" : "Win"); MEOSN_VIDEOSETUP_RESOLUTION[j] = resolution[j].name; ++MEOS_VIDEOSETUP_RESOLUTION.numOptions; }