# HG changeset patch # User Wuzzy # Date 1557783840 -7200 # Node ID 873dda2325c1117bf727993a25ba15d2a87f22f6 # Parent ff4003a90ff893c901851f8d0d541d687880d954 Change voicepack fallback to Default_qau diff -r ff4003a90ff8 -r 873dda2325c1 hedgewars/uSound.pas --- a/hedgewars/uSound.pas Mon May 13 23:13:53 2019 +0200 +++ b/hedgewars/uSound.pas Mon May 13 23:44:00 2019 +0200 @@ -336,8 +336,9 @@ function AskForVoicepack(name: shortstring): Pointer; var i: Longword; - tmp, langName, path: shortstring; + tmp, nameStart, langName, path: shortstring; begin + nameStart:= name; i:= 0; { Adjust for language suffix: Voicepacks can have an optional language suffix. @@ -368,13 +369,9 @@ path:= cPathz[ptVoices] + '/' + name; - // Fallback to Default if voicepack can't be found at all - if (name <> 'Default') and (not pfsExists(path)) then - begin - path:= cPathz[ptVoices] + '/Default'; - if pfsExists(path) then - exit(AskForVoicepack('Default')); - end; + // Fallback to localized Default if voicepack can't be found at all + if (nameStart <> 'Default_qau') and (not pfsExists(path)) then + exit(AskForVoicepack('Default_qau')); while (voicepacks[i].name <> name) and (voicepacks[i].name <> '') and (i < cMaxTeams) do begin