diff -r 2ed42786aca7 -r 091293bc974f hedgewars/uSound.pas --- a/hedgewars/uSound.pas Sun Nov 11 14:59:22 2012 +0100 +++ b/hedgewars/uSound.pas Sun Nov 11 15:14:18 2012 +0100 @@ -139,7 +139,7 @@ path:= Pathz[ptVoices] + '/' + locName; if DirectoryExists(path) then name:= locName - else if Length(cLocale) > 2 + else if Length(cLocale) > 3 then begin locName:= name+'_'+Copy(cLocale,1,2); @@ -270,6 +270,8 @@ s:= UserPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; if (not FileExists(s)) then s:= Pathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; + if (not FileExists(s)) and (snd in [sndFirePunch2, sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6]) then + s:= Pathz[Soundz[sndFirePunch1].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; WriteToConsole(msgLoading + s + ' '); voicepack^.chunks[snd]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), _P'rb'), 1); if voicepack^.chunks[snd] = nil then @@ -494,7 +496,7 @@ procedure MuteAudio; begin - if (not isSoundEnabled) then + if not isSoundEnabled then exit; if (isAudioMuted) then