Allow the game to run without sounds.

Reapplication of commit d290ae9a9b526551f399580c294289be128a1039.

diff --git a/src/mapData.cpp b/src/mapData.cpp
index dfe8514fb00bb10c337477bb1913c8f3763bcc9c..6b178116f74b9764d8759b275e9e904dcb6b47e2 100644 (file)
--- a/src/mapData.cpp
+++ b/src/mapData.cpp
@@ -247,8 +247,7 @@ void getMapTokens()
                        else if (strcmp("AMBIENCE", mapEntity) == 0)
                        {
                                sscanf(token, "%*s %*s %s", string[0]);
-                               if (!audio.loadSound(SND_AMBIANCE, string[0]))
-                                       graphics.showErrorAndExit(ERR_FILE, string[0]);
+                               audio.loadSound(SND_AMBIANCE, string[0]);
                        }
                        else if (strcmp("WATERLEVEL", mapEntity) == 0)
                        {

diff --git a/src/resources.cpp b/src/resources.cpp
index 51a516a21d728e0c9996b036a95307047fe49290..5308eff6d587fa0057645b092fd925567a7bb106 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -22,8 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 void loadSound(int index, const char *filename)
 {
-       if (!audio.loadSound(index, filename))
-               graphics.showErrorAndExit(ERR_FILE, filename);
+       audio.loadSound(index, filename);
 
        graphics.showLoading(1, 30);
 }