Fix -Wint-in-bool-context

voidanix · Robert Alm Nilsson · voidanix · commit b2151feea188 · 2022-06-24T10:39:47.000+02:00
The mattrig macro expands the mw argument into at one point into:

if (curmat != MAT_WATER ? S_SPLASH2 : S_SPLASH1 &gt;= 0)

Co-authored-by: Robert Alm Nilsson &lt;rorialni@gmail.com&gt;
diff --git a/src/game/physics.cpp b/src/game/physics.cpp
@@ -1050,7 +1050,7 @@ namespace physics
             { \
                 int col = (int(mcol[2]*mq) + (int(mcol[1]*mq) << 8) + (int(mcol[0]*mq) << 16)); \
                 regularshape(mp, mt, col, 21, 20, mz, mo, ms, 1, 10, 0, 20); \
-                if(mw >= 0) playsound(mw, mo, pl); \
+                if((mw) >= 0) playsound(mw, mo, pl); \
             }
             if(curmat == MAT_WATER || oldmat == MAT_WATER)
             {

Original file line number	Diff line number	Diff line change
`@@ -1050,7 +1050,7 @@ namespace physics`
`1050`	`1050`	`{ \`
`1051`	`1051`	`int col = (int(mcol[2]mq) + (int(mcol[1]mq) << 8) + (int(mcol[0]*mq) << 16)); \`
`1052`	`1052`	`regularshape(mp, mt, col, 21, 20, mz, mo, ms, 1, 10, 0, 20); \`
`1053`		`- if(mw >= 0) playsound(mw, mo, pl); \`
	`1053`	`+ if((mw) >= 0) playsound(mw, mo, pl); \`
`1054`	`1054`	`}`
`1055`	`1055`	`if(curmat == MAT_WATER \|\| oldmat == MAT_WATER)`
`1056`	`1056`	`{`