renamed snd_reload to snd_unloadallsounds to clarify its purpose

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7339 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/darkplaces.txt b/darkplaces.txt
index 18ab371e1899a7f97f17816e5f2c8a16dd617932..c5e96e89e63809ff2b8accccccfaae38e3096c74 100644 (file)
--- a/darkplaces.txt
+++ b/darkplaces.txt
@@ -1200,7 +1200,7 @@ setinfo                                           modifies your userinfo
 sizedown                                          decrease view size (decreases viewsize cvar)\r
 sizeup                                            increase view size (increases viewsize cvar)\r
 skins                                             downloads missing qw skins from server\r
-snd_reload                                        reload all sound files\r
+snd_unloadallsounds                               unload all sound files\r
 snd_restart                                       restart sound system\r
 soundinfo                                         print sound system information (such as channels and speed)\r
 soundlist                                         list loaded sounds\r

diff --git a/fs.c b/fs.c
index 89e290ae990de8baf6d54b4a053e269d59418850..6df061215e99b32a195e1ac2dc84c8c2677d9326 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1230,8 +1230,8 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean
        // exec the new config
        Host_LoadConfig_f();
 
-       // reinitialize the loaded sounds
-       S_Reload_f();
+       // unload all sounds so they will be reloaded from the new files as needed
+       S_UnloadAllSounds_f();
 
        // reinitialize renderer (this reloads hud/console background/etc)
        R_Modules_Restart();

diff --git a/snd_main.c b/snd_main.c
index 1734baeac2246df6ed7e55c73ebcc865dd6efcb2..e29b55eb060039efac85467658fed0c046705831 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -724,7 +724,7 @@ void S_Init(void)
        Cmd_AddCommand("soundlist", S_SoundList_f, "list loaded sounds");
        Cmd_AddCommand("soundinfo", S_SoundInfo_f, "print sound system information (such as channels and speed)");
        Cmd_AddCommand("snd_restart", S_Restart_f, "restart sound system");
-       Cmd_AddCommand("snd_reload", S_Reload_f, "reload all sound files");
+       Cmd_AddCommand("snd_unloadallsounds", S_UnloadAllSounds_f, "unload all sound files");
 
        Cvar_RegisterVariable(&nosound);
        Cvar_RegisterVariable(&snd_precache);
@@ -773,10 +773,10 @@ void S_Terminate (void)
 
 /*
 ==================
-S_Reload_f
+S_UnloadAllSounds_f
 ==================
 */
-void S_Reload_f (void)
+void S_UnloadAllSounds_f (void)
 {
        int i;
 

diff --git a/snd_null.c b/snd_null.c
index 6eb6b94c4e96f8d8ffd1b51c68fd2c12316c3ea4..df7463fc6ac8b1b30367542431bb073004dd7002 100755 (executable)
--- a/snd_null.c
+++ b/snd_null.c
@@ -91,7 +91,7 @@ qboolean S_IsSoundPrecached (const sfx_t *sfx)
        return false;
 }
 
-void S_Reload_f (void)
+void S_UnloadAllSounds_f (void)
 {
 }
 

diff --git a/sound.h b/sound.h
index fbd5755ba5b40f3f2d59addd9fc903998524250e..b1e0cb094cecd7731dc8b945e3eed52d173228e1 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -60,7 +60,7 @@ void S_Terminate (void);
 
 void S_Startup (void);
 void S_Shutdown (void);
-void S_Reload_f (void);
+void S_UnloadAllSounds_f (void);
 
 void S_Update(const matrix4x4_t *listenermatrix);
 void S_ExtraUpdate (void);