From 1b5dd687d2cc8837bb96b7daa921944dc99dbf76 Mon Sep 17 00:00:00 2001
From: Alam Arias <alam@srb2.org>
Date: Fri, 11 Nov 2022 20:31:04 -0500
Subject: [PATCH] Cleanup whitespace changes from master branch
---
src/CMakeLists.txt | 2 +-
src/android/i_system.c | 2 +-
src/g_game.c | 4 ++--
src/hu_stuff.c | 2 +-
src/lua_hudlib.c | 2 +-
src/lua_hudlib_drawlist.h | 2 +-
src/p_enemy.c | 2 +-
src/p_polyobj.c | 4 ++--
src/p_tick.c | 2 +-
src/r_fps.c | 6 +++---
src/y_inter.c | 2 +-
thirdparty/CMakeLists.txt | 8 ++++----
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6459de3c0..6fe260fb46 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 1fba4d8253..f0edcc17ef 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 abefac161f..349d905586 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 2a9e4d2a9b..c037abcd79 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 40c6f6e1fc..785124fec1 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 5e97b5c265..57d3de3c35 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 8a5c2c743f..0ed62f4b4b 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 4062f9a9fc..7ef956ff17 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 bf6e8f42ed..fe6a4d33f2 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 f3675ab97e..ae23b5d1b1 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 4f7b0499df..7faceff50e 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 37c36399ac..8fa47ba3ae 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")
--
GitLab