lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove trailing whitespace

This commit is contained in:
James R 2020-12-12 02:37:03 -08:00
parent e4cf8ebcf5
commit b31c4db89d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/console.c
View File

@ -1421,7 +1421,7 @@ void CONS_Printf(const char *fmt, ...)
if (con_started) if (con_started)
CON_Print(txt); CON_Print(txt);
CON_LogMessage(txt); CON_LogMessage(txt);
Lock_state(); Lock_state();

2
src/lua_hooklib.c
View File

@ -1793,6 +1793,6 @@ void LUAh_GameQuit(void)
hookp->error = true; hookp->error = true;
} }
} }
lua_pop(gL, 1); // Pop error handler lua_pop(gL, 1); // Pop error handler
} }

2
src/m_menu.c
View File

@ -1483,7 +1483,7 @@ static menuitem_t OP_SoundOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "MIDI Music", &cv_gamemidimusic, 36}, {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 | IT_CV_SLIDER, NULL, "MIDI Music Volume", &cv_midimusicvolume, 41},
{IT_STRING | IT_CVAR, NULL, "Music Preference", &cv_musicpref, 51}, {IT_STRING | IT_CVAR, NULL, "Music Preference", &cv_musicpref, 51},
{IT_HEADER, NULL, "Miscellaneous", NULL, 61}, {IT_HEADER, NULL, "Miscellaneous", NULL, 61},

6
src/p_inter.c
View File

@ -470,14 +470,14 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (!(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)) 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 fixed_t setmomz = -toucher->momz; // Store this, momz get changed by P_DoJump within P_DoBubbleBounce
if (elementalpierce == 2) // Reset bubblewrap, part 1 if (elementalpierce == 2) // Reset bubblewrap, part 1
P_DoBubbleBounce(player); P_DoBubbleBounce(player);
toucher->momz = setmomz; toucher->momz = setmomz;
if (elementalpierce == 2) // Reset bubblewrap, part 2 if (elementalpierce == 2) // Reset bubblewrap, part 2
{ {
boolean underwater = toucher->eflags & MFE_UNDERWATER; boolean underwater = toucher->eflags & MFE_UNDERWATER;
if (underwater) if (underwater)
toucher->momz /= 2; toucher->momz /= 2;
toucher->momz -= (toucher->momz/(underwater ? 8 : 4)); // Cap the height! 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)) if (special->tracer && !(special->tracer->flags2 & MF2_STRONGBOX))
macespin = true; macespin = true;
if (macespin ? (player->powers[pw_ignorelatch] & (1<<15)) : (player->powers[pw_ignorelatch])) if (macespin ? (player->powers[pw_ignorelatch] & (1<<15)) : (player->powers[pw_ignorelatch]))
return; return;

4
src/p_map.c
View File

@ -1681,7 +1681,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (!(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)) if (!(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
{ {
fixed_t setmomz = -*momz; // Store this, momz get changed by P_DoJump within P_DoBubbleBounce fixed_t setmomz = -*momz; // Store this, momz get changed by P_DoJump within P_DoBubbleBounce
if (elementalpierce == 2) // Reset bubblewrap, part 1 if (elementalpierce == 2) // Reset bubblewrap, part 1
P_DoBubbleBounce(player); P_DoBubbleBounce(player);
*momz = setmomz; // Therefore, you should be thrust in the opposite direction, vertically. *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 if (elementalpierce == 2) // Reset bubblewrap, part 2
{ {
boolean underwater = tmthing->eflags & MFE_UNDERWATER; boolean underwater = tmthing->eflags & MFE_UNDERWATER;
if (underwater) if (underwater)
*momz /= 2; *momz /= 2;
*momz -= (*momz/(underwater ? 8 : 4)); // Cap the height! *momz -= (*momz/(underwater ? 8 : 4)); // Cap the height!

4
src/s_sound.c
View File

@ -2152,7 +2152,7 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst)
static lumpnum_t S_GetMusicLumpNum(const char *mname) static lumpnum_t S_GetMusicLumpNum(const char *mname)
{ {
boolean midipref = cv_musicpref.value; boolean midipref = cv_musicpref.value;
if (S_PrefAvailable(midipref, mname)) if (S_PrefAvailable(midipref, mname))
return W_GetNumForName(va(midipref ? "d_%s":"o_%s", mname)); return W_GetNumForName(va(midipref ? "d_%s":"o_%s", mname));
else if (S_PrefAvailable(!midipref, 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); I_FadeSong(0, prefadems, S_ChangeMusicToQueue);
return; 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))) (midipref != currentmidi && S_PrefAvailable(midipref, newmusic)))
{ {
CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic); CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic);