From 695b14e7a6d51dbe645754741e84c8f608a0babd Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Sat, 8 Nov 2008 02:02:48 +0000
Subject: [PATCH] sound clearing fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3437 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/client.cpp | 2 +-
 source/src/protos.h   | 2 +-
 source/src/sound.cpp  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/src/client.cpp b/source/src/client.cpp
index 03d34e17..2a09f07c 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -167,7 +167,7 @@ void disconnect(int onlyclean, int async)
         kickallbots();
         loopv(players) zapplayer(players[i]);
         clearvote();
-        clearworldsounds();
+        clearworldsounds(false);
         localdisconnect();
     }
 #if 0
diff --git a/source/src/protos.h b/source/src/protos.h
index a2fa5a55..9df325ac 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -559,7 +559,7 @@ extern void initsound();
 extern void soundcleanup();
 extern void musicsuggest(int id, int millis = 0, bool rndofs = false);
 extern void musicfadeout(int id);
-extern void clearworldsounds();
+extern void clearworldsounds(bool fullclean = true);
 extern void detachsounds(playerent *owner);
 extern void updateaudio();
 extern void preloadmapsound(entity &e);
diff --git a/source/src/sound.cpp b/source/src/sound.cpp
index 77871047..a6a8aff3 100644
--- a/source/src/sound.cpp
+++ b/source/src/sound.cpp
@@ -1528,10 +1528,10 @@ void soundcleanup()
 }
 
 // clear world-related sounds, called on mapchange
-void clearworldsounds()
+void clearworldsounds(bool fullclean)
 {
     stopsound();
-    mapsounds.setsize(0);
+    if(fullclean) mapsounds.setsize(0);
     locations.deleteworldobjsounds();
 }