From b31c4db89d4b6a65b952fa6613605c886d8cb11a Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 12 Dec 2020 02:37:03 -0800
Subject: [PATCH] Remove trailing whitespace
---
src/console.c | 2 +-
src/lua_hooklib.c | 2 +-
src/m_menu.c | 2 +-
src/p_inter.c | 6 +++---
src/p_map.c | 4 ++--
src/s_sound.c | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/console.c b/src/console.c
index 21f660a56b..f3b0aa6034 100644
--- a/src/console.c
+++ b/src/console.c
@@ -1421,7 +1421,7 @@ void CONS_Printf(const char *fmt, ...)
if (con_started)
CON_Print(txt);
- CON_LogMessage(txt);
+ CON_LogMessage(txt);
Lock_state();
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index ebf6f9deb2..d02601ce44 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -1793,6 +1793,6 @@ void LUAh_GameQuit(void)
hookp->error = true;
}
}
-
+
lua_pop(gL, 1); // Pop error handler
}
diff --git a/src/m_menu.c b/src/m_menu.c
index c7786a4965..9c21fbc000 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1483,7 +1483,7 @@ static menuitem_t OP_SoundOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 36},
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 41},
-
+
{IT_STRING | IT_CVAR, NULL, "Music Preference", &cv_musicpref, 51},
{IT_HEADER, NULL, "Miscellaneous", NULL, 61},
diff --git a/src/p_inter.c b/src/p_inter.c
index bd044f32a1..5f2050b7f3 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -470,14 +470,14 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (!(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
{
fixed_t setmomz = -toucher->momz; // Store this, momz get changed by P_DoJump within P_DoBubbleBounce
-
+
if (elementalpierce == 2) // Reset bubblewrap, part 1
P_DoBubbleBounce(player);
toucher->momz = setmomz;
if (elementalpierce == 2) // Reset bubblewrap, part 2
{
boolean underwater = toucher->eflags & MFE_UNDERWATER;
-
+
if (underwater)
toucher->momz /= 2;
toucher->momz -= (toucher->momz/(underwater ? 8 : 4)); // Cap the height!
@@ -1613,7 +1613,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->tracer && !(special->tracer->flags2 & MF2_STRONGBOX))
macespin = true;
-
+
if (macespin ? (player->powers[pw_ignorelatch] & (1<<15)) : (player->powers[pw_ignorelatch]))
return;
diff --git a/src/p_map.c b/src/p_map.c
index 74c2790f75..1c10a78f3b 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1681,7 +1681,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (!(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
{
fixed_t setmomz = -*momz; // Store this, momz get changed by P_DoJump within P_DoBubbleBounce
-
+
if (elementalpierce == 2) // Reset bubblewrap, part 1
P_DoBubbleBounce(player);
*momz = setmomz; // Therefore, you should be thrust in the opposite direction, vertically.
@@ -1690,7 +1690,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (elementalpierce == 2) // Reset bubblewrap, part 2
{
boolean underwater = tmthing->eflags & MFE_UNDERWATER;
-
+
if (underwater)
*momz /= 2;
*momz -= (*momz/(underwater ? 8 : 4)); // Cap the height!
diff --git a/src/s_sound.c b/src/s_sound.c
index 1885cfcf94..64f092b80e 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2152,7 +2152,7 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst)
static lumpnum_t S_GetMusicLumpNum(const char *mname)
{
boolean midipref = cv_musicpref.value;
-
+
if (S_PrefAvailable(midipref, mname))
return W_GetNumForName(va(midipref ? "d_%s":"o_%s", mname));
else if (S_PrefAvailable(!midipref, mname))
@@ -2302,7 +2302,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
I_FadeSong(0, prefadems, S_ChangeMusicToQueue);
return;
}
- else if (strnicmp(music_name, newmusic, 6) || (mflags & MUSIC_FORCERESET) ||
+ else if (strnicmp(music_name, newmusic, 6) || (mflags & MUSIC_FORCERESET) ||
(midipref != currentmidi && S_PrefAvailable(midipref, newmusic)))
{
CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic);
--
GitLab