commit 06dfd81d3b81142161dc8d1f1f163581ce94e48f
Author: Jonathan Dowland <jon+github@alcopop.org>
AuthorDate: Fri Jun 12 18:54:18 2015 +0100
Commit: Jonathan Dowland <jon+github@alcopop.org>
CommitDate: Mon Jun 22 17:05:19 2015 +0100
remove trailing whitespace
---
src/doom/s_sound.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/doom/s_sound.c b/src/doom/s_sound.c
index b94041f7..bccb41a8 100644
--- a/src/doom/s_sound.c
+++ b/src/doom/s_sound.c
@@ -46,7 +46,7 @@
// Distance tp origin when sounds should be maxed out.
// This should relate to movement clipping resolution
// (see BLOCKMAP handling).
-// In the source code release: (160*FRACUNIT). Changed back to the
+// In the source code release: (160*FRACUNIT). Changed back to the
// Vanilla value of 200 (why was this changed?)
#define S_CLOSE_DIST (200 * FRACUNIT)
@@ -73,7 +73,7 @@ typedef struct
// handle of the sound being played
int handle;
-
+
} channel_t;
// The set of channels available
@@ -85,7 +85,7 @@ static channel_t *channels;
int sfxVolume = 8;
-// Maximum volume of music.
+// Maximum volume of music.
int musicVolume = 8;
@@ -95,7 +95,7 @@ static int snd_SfxVolume;
// Whether songs are mus_paused
-static boolean mus_paused;
+static boolean mus_paused;
// Music currently being played
@@ -112,7 +112,7 @@ int snd_channels = 8;
//
void S_Init(int sfxVolume, int musicVolume)
-{
+{
int i;
I_SetOPLDriverVer(opl_v_new);
@@ -237,10 +237,10 @@ void S_Start(void)
{
mnum = spmus[gamemap-1];
}
- }
+ }
S_ChangeMusic(mnum, true);
-}
+}
void S_StopSound(mobj_t *origin)
{
@@ -265,7 +265,7 @@ static int S_GetChannel(mobj_t *origin, sfxinfo_t *sfxinfo)
{
// channel number to use
int cnum;
-
+
channel_t* c;
// Find an open channel
@@ -296,7 +296,7 @@ static int S_GetChannel(mobj_t *origin, sfxinfo_t *sfxinfo)
if (cnum == snd_channels)
{
- // FUCK! No lower priority. Sorry, Charlie.
+ // FUCK! No lower priority. Sorry, Charlie.
return -1;
}
else
@@ -337,12 +337,12 @@ static int S_AdjustSoundParams(mobj_t *listener, mobj_t *source,
// From _GG1_ p.428. Appox. eucledian distance fast.
approx_dist = adx + ady - ((adx < ady ? adx : ady)>>1);
-
+
if (gamemap != 8 && approx_dist > S_CLIPPING_DIST)
{
return 0;
}
-
+
// angle of source to listener
angle = R_PointToAngle2(listener->x,
listener->y,
@@ -384,9 +384,9 @@ static int S_AdjustSoundParams(mobj_t *listener, mobj_t *source,
// distance effect
*vol = (snd_SfxVolume
* ((S_CLIPPING_DIST - approx_dist)>>FRACBITS))
- / S_ATTENUATOR;
+ / S_ATTENUATOR;
}
-
+
return (*vol > 0);
}
@@ -475,7 +475,7 @@ void S_StartSound(void *origin_p, int sfx_id)
}
channels[cnum].handle = I_StartSound(sfx, cnum, volume, sep);
-}
+}
//
// Stop and resume music, during game PAUSE.
@@ -549,7 +549,7 @@ void S_UpdateSounds(mobj_t *listener)
c->origin,
&volume,
&sep);
-
+
if (!audible)
{
S_StopChannel(cnum);
@@ -576,7 +576,7 @@ void S_SetMusicVolume(int volume)
{
I_Error("Attempt to set music volume at %d",
volume);
- }
+ }
I_SetMusicVolume(volume);
}