# HG changeset patch
# User nemo
# Date 1321208824 18000
# Node ID bc157c3dac43f0a9724ec09177b94641e62eb5ed
# Parent  52cb4807a78ccfef9cd1a016f22b4419c28e5860# Parent  eca20f8990e2662bda072628569c2003745458a1
Merge .17 and trunk

diff -r 52cb4807a78c -r bc157c3dac43 CMakeLists.txt
diff -r 52cb4807a78c -r bc157c3dac43 hedgewars/uScript.pas
--- a/hedgewars/uScript.pas	Sun Nov 13 20:24:55 2011 +0300
+++ b/hedgewars/uScript.pas	Sun Nov 13 13:27:04 2011 -0500
@@ -1616,7 +1616,7 @@
 ScriptSetInteger('SuddenDeathTurns', cSuddenDTurns);
 ScriptSetInteger('WaterRise', cWaterRise);
 ScriptSetInteger('HealthDecrease', cHealthDecrease);
-ScriptSetString('Map', '');
+ScriptSetString('Map', 'CHANGE_ME');
 ScriptSetString('Theme', '');
 ScriptSetString('Goals', '');
 
@@ -1642,7 +1642,8 @@
 cWaterRise       := ScriptGetInteger('WaterRise');
 cHealthDecrease  := ScriptGetInteger('HealthDecrease');
 
-ParseCommand('map ' + ScriptGetString('Map'), true);
+if ScriptGetString('Map') <> 'CHANGE_ME' then
+    ParseCommand('map ' + ScriptGetString('Map'), true);
 if ScriptGetString('Theme') <> '' then
     ParseCommand('theme ' + ScriptGetString('Theme'), true);
 LuaGoals:= ScriptGetString('Goals');
diff -r 52cb4807a78c -r bc157c3dac43 hedgewars/uSound.pas
--- a/hedgewars/uSound.pas	Sun Nov 13 20:24:55 2011 +0300
+++ b/hedgewars/uSound.pas	Sun Nov 13 13:27:04 2011 -0500
@@ -287,6 +287,13 @@
 var i : LongInt;
 begin
     if (not isSoundEnabled) or fastUntilLag or ((LastVoice.snd = snd) and  (LastVoice.voicepack = voicepack)) then exit;
+    if (snd = sndVictory) or (snd = sndFlawless) then
+        begin
+        for i:= 1 to Succ(chanTPU) do StopSound(i);
+        for i:= 0 to 7 do VoiceList[i].snd:= sndNone;
+        LastVoice.snd:= sndNone;
+        end;
+
     i:= 0;
     while (i<8) and (VoiceList[i].snd <> sndNone) do inc(i);
 
diff -r 52cb4807a78c -r bc157c3dac43 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Sun Nov 13 20:24:55 2011 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts	Sun Nov 13 13:27:04 2011 -0500
@@ -401,7 +401,7 @@
     </message>
     <message>
         <source>User quit</source>
-        <translation">Utilizador saiu</translation>
+        <translation>Utilizador saiu</translation>
     </message>
 </context>
 <context>