# HG changeset patch
# User nemo
# Date 1544716267 18000
# Node ID 94f10f69fe76df6de61d9e0a8bc142c29111446b
# Parent  b33d1c694b1dd5e0f436758a0e137110bd7a3a70# Parent  1ffa8bfc5c58a8aecfe315076f2075d6f3e4ea14
merge in 0.9.25 fixes

diff -r b33d1c694b1d -r 94f10f69fe76 gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs	Thu Dec 13 09:50:24 2018 -0500
+++ b/gameServer/CoreTypes.hs	Thu Dec 13 10:51:07 2018 -0500
@@ -312,8 +312,8 @@
         True
         False
         "<h2><p align=center><a href=\"https://www.hedgewars.org/\">https://www.hedgewars.org/</a></p></h2>"
-        "<font color=yellow><h3 align=center>Hedgewars 0.9.24 is out! Please update.</h3><p align=center><a href=https://hedgewars.org/download.html>Download page here</a></font>"
-        55 -- latestReleaseVersion
+        "<font color=yellow><h3 align=center>Hedgewars 0.9.25 is out! Please update.</h3><p align=center><a href=https://hedgewars.org/download.html>Download page here</a></font>"
+        57 -- latestReleaseVersion
         41 -- earliestCompatibleVersion
         46631
         ""
diff -r b33d1c694b1d -r 94f10f69fe76 hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas	Thu Dec 13 09:50:24 2018 -0500
+++ b/hedgewars/hwengine.pas	Thu Dec 13 10:51:07 2018 -0500
@@ -140,14 +140,12 @@
     if flagMakeCapture then
         begin
         flagMakeCapture:= false;
+        {$IFNDEF PAS2C}
         if flagDumpLand then
              s:= '/Screenshots/mapdump_'
         else s:= '/Screenshots/hw_';
-        {$IFDEF PAS2C}
         s:= s + inttostr(GameTicks);
-        {$ELSE}
         s:= s + FormatDateTime('YYYY-MM-DD_HH-mm-ss', Now()) + inttostr(GameTicks);
-        {$ENDIF}
 
         // flash
         playSound(sndShutter);
@@ -163,6 +161,7 @@
             WriteLnToConsole('Screenshot failed.');
             AddChatString(#5 + 'screen capture failed (lack of memory or write permissions)');
             end
+        {$ENDIF}
         end;
 end;