diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6459de3c0aced7c64724d54ec60487fca01bfdf..6fe260fb4633fa4909100cf78149e6bbf2100fbb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -156,7 +156,7 @@ target_compile_options(SRB2SDL2 PRIVATE
-Winline
-Wformat-y2k
-Wformat-security
-
+
$<$<VERSION_LESS:$<C_COMPILER_VERSION>,2.9.5>:
-Wno-div-by-zero
-Wendif-labels
diff --git a/src/android/i_system.c b/src/android/i_system.c
index 1fba4d82536bc532cd8ee498afd105c35fd59d15..f0edcc17efb6445c32cfc7c68452714b55cd8909 100644
--- a/src/android/i_system.c
+++ b/src/android/i_system.c
@@ -89,7 +89,7 @@ precise_t I_GetPreciseTime(void)
return 0;
}
-UINT64 I_GetPrecisePrecision(void)
+UINT64 I_GetPrecisePrecision(void)
{
return 1000000;
}
diff --git a/src/g_game.c b/src/g_game.c
index abefac161fefce2f13d28fbc255f2b3500bd275e..349d9055863135467af8d604c2dbc6f9240dda43 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2809,9 +2809,9 @@ void G_MovePlayerToSpawnOrStarpost(INT32 playernum)
P_MovePlayerToStarpost(playernum);
else
P_MovePlayerToSpawn(playernum, G_FindMapStart(playernum));
-
+
R_ResetMobjInterpolationState(players[playernum].mo);
-
+
if (playernum == consoleplayer)
P_ResetCamera(&players[playernum], &camera);
else if (playernum == secondarydisplayplayer)
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 2a9e4d2a9b76bbaa87a79ec1294fab214d73609e..c037abcd797ac73ee38b1945d9159951bc62b968 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1996,7 +1996,7 @@ void HU_Drawer(void)
}
else
HU_DrawCoopOverlay();
-
+
if (renderisnewtic)
{
LUA_HUD_ClearDrawList(luahuddrawlist_scores);
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 40c6f6e1fc0e8ad901d31adfdbea28b559e3860b..785124fec1257ec3d403e4ee831c039d3d99a452 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -1185,7 +1185,7 @@ static int libd_fadeScreen(lua_State *L)
LUA_HUD_AddFadeScreen(list, color, strength);
else
V_DrawFadeScreen(color, strength);
-
+
return 0;
}
diff --git a/src/lua_hudlib_drawlist.h b/src/lua_hudlib_drawlist.h
index 5e97b5c2653bd5dcded976fe5e274a4ec1d31cd7..57d3de3c355b24d4e0771fae5c3406166f470a4f 100644
--- a/src/lua_hudlib_drawlist.h
+++ b/src/lua_hudlib_drawlist.h
@@ -147,6 +147,6 @@ void LUA_HUD_DrawList(huddrawlist_h list);
#ifdef __cplusplus
} // extern "C"
-#endif
+#endif
#endif // __LUA_HUDLIB_DRAWLIST__
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 8a5c2c743f2ca2136cc5ffc3d26c92306e0c824a..0ed62f4b4b88091a9e2059215e75259d5726d0f1 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -11893,7 +11893,7 @@ void A_FlickyCenter(mobj_t *actor)
if (actor->target && P_AproxDistance(actor->target->x - originx, actor->target->y - originy) < actor->extravalue1)
{
actor->extravalue2 = 1;
- P_SetOrigin(actor, actor->target->x, actor->target->y, actor->target->z);
+ P_SetOrigin(actor, actor->target->x, actor->target->y, actor->target->z);
}
else if(actor->extravalue2)
{
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index 4062f9a9fcd361fcf6043843314d3e8041ba19cc..7ef956ff17abf4400f8cebc4b2d0a7a19103b0f4 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -2052,7 +2052,7 @@ boolean EV_DoPolyObjRotate(polyrotdata_t *prdata)
// interpolation
R_CreateInterpolator_Polyobj(&th->thinker, po);
-
+
th->turnobjs = 0;
if (!(prdata->flags & TMPR_DONTROTATEOTHERS))
th->turnobjs |= PTF_OTHERS;
@@ -2194,7 +2194,7 @@ boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
R_CreateInterpolator_Polyobj(&th->thinker, po);
// T_PolyObjWaypoint is the only polyobject movement
// that can adjust z, so we add these ones too.
- R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, false);
+ R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, false);
R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, true);
// Most other polyobject functions handle children by recursively
diff --git a/src/p_tick.c b/src/p_tick.c
index bf6e8f42ed1246b4067d626bbefe048b66b68baf..fe6a4d33f28639f11c10f836dcad6ce8e88762b9 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -804,7 +804,7 @@ void P_Ticker(boolean run)
}
}
}
-
+
}
P_MapEnd();
diff --git a/src/r_fps.c b/src/r_fps.c
index f3675ab97ef2e1a57677da60c08582c9f5f835da..ae23b5d1b1a07afe3b6b34131c7a5a211f7100ca 100644
--- a/src/r_fps.c
+++ b/src/r_fps.c
@@ -368,7 +368,7 @@ static void AddInterpolator(levelinterpolator_t* interpolator)
{
levelinterpolators_size *= 2;
}
-
+
levelinterpolators = Z_ReallocAlign(
(void*) levelinterpolators,
sizeof(levelinterpolator_t*) * levelinterpolators_size,
@@ -616,7 +616,7 @@ void R_RestoreLevelInterpolators(void)
for (i = 0; i < levelinterpolators_len; i++)
{
levelinterpolator_t *interp = levelinterpolators[i];
-
+
switch (interp->type)
{
case LVLINTERP_SectorPlane:
@@ -671,7 +671,7 @@ void R_DestroyLevelInterpolators(thinker_t *thinker)
for (i = 0; i < levelinterpolators_len; i++)
{
levelinterpolator_t *interp = levelinterpolators[i];
-
+
if (interp->thinker == thinker)
{
// Swap the tail of the level interpolators to this spot
diff --git a/src/y_inter.c b/src/y_inter.c
index 4f7b0499df639b87de71ea8b036ef38950f5c559..7faceff50ecd627011da0dd7b36d289a7ef0c4ac 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1131,7 +1131,7 @@ void Y_Ticker(void)
S_ChangeMusicInternal("_clear", false); // don't loop it
tallydonetic = -1;
}
-
+
// emerald bounce
if (intertic <= 1)
{
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 37c36399aca2b8a52f8d633e0f088cd0a5f6a83b..8fa47ba3ae2cf835ab605ee0daf5c4ed09fd33cd 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -88,7 +88,7 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
zutil.c
)
list(TRANSFORM ZLIB_SRCS PREPEND "${ZLIB_SOURCE_DIR}/")
-
+
configure_file("${ZLIB_SOURCE_DIR}/zlib.pc.cmakein" "${ZLIB_BINARY_DIR}/zlib.pc" @ONLY)
configure_file("${ZLIB_SOURCE_DIR}/zconf.h.cmakein" "${ZLIB_BINARY_DIR}/include/zconf.h" @ONLY)
@@ -122,7 +122,7 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
png.h
pngconf.h
-
+
pngpriv.h
pngdebug.h
pnginfo.h
@@ -471,7 +471,7 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
soundlib/OggStream.h
soundlib/Loaders.h
soundlib/BitReader.h
- soundlib/opal.h
+ soundlib/opal.h
sounddsp/AGC.cpp
sounddsp/EQ.cpp
@@ -500,7 +500,7 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
endif()
target_compile_features(openmpt PRIVATE cxx_std_11)
target_compile_definitions(openmpt PRIVATE -DLIBOPENMPT_BUILD)
-
+
target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/common")
target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/src")
target_include_directories(openmpt PRIVATE "${openmpt_SOURCE_DIR}/include")