diff options
| author | Simon Howard | 2009-10-01 01:10:17 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-10-01 01:10:17 +0000 |
| commit | 06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7 (patch) | |
| tree | 91532a8428caeba2c2ba3ba21b8299a5dfad79a5 /src/s_sound.c | |
| parent | 4a70f989d2aacabffc2f02017704de042be7418a (diff) | |
| parent | 508c3fd3fa5b3149d329e15ea3e072ad2a7aa2f2 (diff) | |
| download | chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.tar.gz chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.tar.bz2 chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.zip | |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1702
Diffstat (limited to 'src/s_sound.c')
| -rw-r--r-- | src/s_sound.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/s_sound.c b/src/s_sound.c index 9e70ec73..c7bb6c8d 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -178,7 +178,7 @@ static boolean SndDeviceInList(snddevice_t device, snddevice_t *list, return false; } -// Find and initialise a sound_module_t appropriate for the setting +// Find and initialize a sound_module_t appropriate for the setting // in snd_sfxdevice. static void InitSfxModule(void) @@ -196,7 +196,7 @@ static void InitSfxModule(void) sound_modules[i]->sound_devices, sound_modules[i]->num_sound_devices)) { - // Initialise the module + // Initialize the module if (sound_modules[i]->Init()) { @@ -207,7 +207,7 @@ static void InitSfxModule(void) } } -// Initialise music according to snd_musicdevice. +// Initialize music according to snd_musicdevice. static void InitMusicModule(void) { @@ -224,7 +224,7 @@ static void InitMusicModule(void) music_modules[i]->sound_devices, music_modules[i]->num_sound_devices)) { - // Initialise the module + // Initialize the module if (music_modules[i]->Init()) { @@ -270,7 +270,7 @@ void S_Init(int sfxVolume, int musicVolume) nomusic = M_CheckParm("-nomusic") > 0; - // Initialise the sound and music subsystems. + // Initialize the sound and music subsystems. if (!nosound && !screensaver_mode) { |