# HG changeset patch # User sheepluva # Date 1476555065 -7200 # Node ID 045f33b498eace944c56160a2b0b9130f8e128fa # Parent 7db5aef27e8d27acef42848c1ab4e9163d55c0be fix copypastafail (incorrect variable name) and whitespaces diff -r 7db5aef27e8d -r 045f33b498ea hedgewars/uSound.pas --- a/hedgewars/uSound.pas Sat Oct 15 20:06:42 2016 +0200 +++ b/hedgewars/uSound.pas Sat Oct 15 20:11:05 2016 +0200 @@ -414,7 +414,7 @@ s:= cPathz[Soundz[sndFirePunch1].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; WriteToConsole(msgLoading + s + ' '); rwops := rwopsOpenRead(s); - + if rwops = nil then begin s:= cPathz[Soundz[snd].AltPath] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; @@ -437,14 +437,14 @@ s:= cPathz[Soundz[snd].Path] + '/' + Soundz[snd].FileName; WriteToConsole(msgLoading + s + ' '); rwops := rwopsOpenRead(s); - + if rwops = nil then begin s:= cPathz[Soundz[snd].AltPath] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; WriteToConsole(msgLoading + s + ' ... '); rwops := rwopsOpenRead(s); end; - + defVoicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwops, 1); if SDLCheck(defVoicepack^.chunks[snd] <> nil, 'Mix_LoadWAV_RW', true) then exit; WriteLnToConsole(msgOK); @@ -532,15 +532,15 @@ s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName; WriteToConsole(msgLoading + s + ' '); rwops:=rwopsOpenRead(s); - + if rwops = nil then begin s:= cPathz[Soundz[snd].AltPath] + '/' + Soundz[snd].FileName; WriteToConsole(msgLoading + s + ' ... '); rwops:=rwopsOpenRead(s); end; - - defVoicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwops, 1); + + voicepack^.chunks[snd]:= Mix_LoadWAV_RW(rwops, 1); if voicepack^.chunks[snd] = nil then WriteLnToConsole(msgFailed) else