Make player sounds per-skin instead of per-model like in Xonotic. Will be needed...

[voretournament/voretournament.git] / data / qcsrc / server / cl_player.qc

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index c0887e40ab197aa7869cb645a8433ddb21273f8f..4ee6f9b9fb3457c290919071cffef017283f204d 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -1194,14 +1194,18 @@ void LoadPlayerSounds(string f, float first)
 }\r
 \r
 .float modelindex_for_playersound;\r
+.float skin_for_playersound;\r
 void UpdatePlayerSounds()\r
 {\r
        if(self.modelindex == self.modelindex_for_playersound)\r
+       if(self.skin == self.skin_for_playersound)\r
                return;\r
        self.modelindex_for_playersound = self.modelindex;\r
+       self.skin_for_playersound = self.skin;\r
        ClearPlayerSounds();\r
        LoadPlayerSounds("sound/player/default.sounds", 1);\r
-       LoadPlayerSounds(strcat(self.model, ".sounds"), 0);\r
+       if not(LoadPlayerSounds(strcat(self.model, "_", ftos(self.skin), ".", "sounds"), 0))\r
+               LoadPlayerSounds(strcat(self.model, ".", "sounds"), 0);\r
 }\r
 \r
 void GlobalSound(string sample, float chan, float voicetype, float vol)\r