Rework sounds management

config/defaults.cfg

@@ -13,12 +13,10 @@ exec "config/brush.cfg"
 exec "config/setup.cfg"
 exec "config/legacy.cfg"
 
-exec "config/sounds/package.cfg"
 exec "config/vanities.cfg"
 
 exec "config/usage.cfg"
 exec "config/tips.cfg"
 
 exec "config/menus/package.cfg" // keep this here, it uses some of the stuff above
-exec "config/voice.cfg"
 exec "config/compass.cfg"

src/cmake/build_client.cmake

@@ -62,7 +62,13 @@ if(BUILD_CLIENT)
         engine/skelmodel.h
         engine/smd.h
         engine/sound.h
+        engine/soundsample.h
+        engine/soundsample.cpp
+        engine/soundslot.h
+        engine/soundslot.cpp
         engine/textedit.h
+        engine/soundslot_collection.h
+        engine/soundslot_collection.cpp
         engine/texture.h
         engine/version.h
         engine/vertmodel.h

src/cmake/build_genkey.cmake

@@ -17,6 +17,13 @@ if(BUILD_GENKEY)
 
         engine/genkey.cpp
         shared/crypto.cpp
+        shared/cube.h
+        shared/tools.h
+        shared/command.h
+        shared/geom.h
+        shared/ents.h
+        shared/iengine.h
+        shared/igame.h
     )
 
     add_blue_nebula_executable(genkey${BIN_SUFFIX} ${genkey_sources})

src/cmake/build_server.cmake

@@ -33,15 +33,29 @@ if(BUILD_SERVER)
         shared/tools.h
 
         shared/crypto.cpp
+        shared/cube.h
+        shared/tools.h
+        shared/command.h
+        shared/geom.h
+        shared/ents.h
+        shared/iengine.h
+        shared/igame.h
         shared/geom.cpp
         shared/stream.cpp
         shared/tools.cpp
         shared/zip.cpp
+        engine/engine.h
+        engine/version.h
         engine/command.cpp
         engine/irc.cpp
         engine/master.cpp
         engine/server.cpp
         game/server.cpp
+        game/capturemode.h
+        game/defendmode.h
+        game/bombermode.h
+        game/duelmut.h
+        game/aiman.h
     )
 
     # dependencies are imported globally in src/CMakeLists.txt

src/engine/main.cpp

@@ -1,6 +1,7 @@
 // main.cpp: initialisation & main loop
 #include "engine.h"
 #include <signal.h>
+#include <game.h>
 
 string caption = "";
 
@@ -1064,6 +1065,7 @@ int main(int argc, char **argv)
 
     conoutf("loading sound..");
     initsound();
+    game::load_game_sounds();
 
     game::start();