Merge from trunk.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1702

1 files changed, 9 insertions, 9 deletions

diff --git a/src/i_pcsound.c b/src/i_pcsound.c
index c2c77fe7..dce7f2b6 100644
--- a/src/i_pcsound.c
+++ b/src/i_pcsound.c
@@ -37,7 +37,7 @@
 
 #include "pcsound.h"
 
-static boolean pcs_initialised = false;
+static boolean pcs_initialized = false;
 
 static SDL_mutex *sound_lock;
 
@@ -151,7 +151,7 @@ static int I_PCS_StartSound(int id,
 {
     int result;
 
-    if (!pcs_initialised)
+    if (!pcs_initialized)
     {
         return -1;
     }
@@ -192,7 +192,7 @@ static int I_PCS_StartSound(int id,
 
 static void I_PCS_StopSound(int handle)
 {
-    if (!pcs_initialised)
+    if (!pcs_initialized)
     {
         return;
     }
@@ -229,7 +229,7 @@ static int I_PCS_GetSfxLumpNum(sfxinfo_t* sfx)
 
 static boolean I_PCS_SoundIsPlaying(int handle)
 {
-    if (!pcs_initialised)
+    if (!pcs_initialized)
     {
         return false;
     }
@@ -248,21 +248,21 @@ static boolean I_PCS_InitSound(void)
 
     PCSound_SetSampleRate(snd_samplerate);
 
-    // Initialise the PC speaker subsystem.
+    // Initialize the PC speaker subsystem.
 
-    pcs_initialised = PCSound_Init(PCSCallbackFunc);
+    pcs_initialized = PCSound_Init(PCSCallbackFunc);
 
-    if (pcs_initialised)
+    if (pcs_initialized)
     {
         sound_lock = SDL_CreateMutex();
     }
 
-    return pcs_initialised;
+    return pcs_initialized;
 }
 
 static void I_PCS_ShutdownSound(void)
 {
-    if (pcs_initialised)
+    if (pcs_initialized)
     {
         PCSound_Shutdown();
     }