# HG changeset patch
# User antonc27 <antonc27@mail.ru>
# Date 1520797395 -3600
# Node ID eefd6d06676816a094bdc7d36adec8cd4464d28e
# Parent  f012ce693681da19d0b8efe9f4761db013aba78a# Parent  c77d75dafe2e880dd2a108e8f4e26d1c4f90cc80
Merge from 0.9.23

diff -r f012ce693681 -r eefd6d066768 CMakeLists.txt
--- a/CMakeLists.txt	Sat Dec 30 01:31:27 2017 +0100
+++ b/CMakeLists.txt	Sun Mar 11 20:43:15 2018 +0100
@@ -9,7 +9,7 @@
     endif()
 endforeach()
 
-foreach(hwpolicy CMP0026)
+foreach(hwpolicy CMP0026 CMP0068)
     if(POLICY ${hwpolicy})
         cmake_policy(SET ${hwpolicy} OLD)
     endif()
diff -r f012ce693681 -r eefd6d066768 QTfrontend/net/tcpBase.cpp
--- a/QTfrontend/net/tcpBase.cpp	Sat Dec 30 01:31:27 2017 +0100
+++ b/QTfrontend/net/tcpBase.cpp	Sun Mar 11 20:43:15 2018 +0100
@@ -228,7 +228,7 @@
 {
     Q_UNUSED(exitStatus);
 
-    if(!m_connected)
+    if(m_connected)
       ClientDisconnect();
 
     // show error message if there was an error that was not an engine's
diff -r f012ce693681 -r eefd6d066768 hedgewars/uIO.pas
--- a/hedgewars/uIO.pas	Sat Dec 30 01:31:27 2017 +0100
+++ b/hedgewars/uIO.pas	Sun Mar 11 20:43:15 2018 +0100
@@ -72,7 +72,14 @@
 function AddCmd(Time: Word; str: shortstring): PCmd;
 var command: PCmd;
 begin
-    if (lastcmd <> nil) and (lastcmd^.cmd = '+') then
+    if (lastcmd <> nil)
+            and (lastcmd^.cmd = '+') // don't overwrite timestamped msg with non-timestamped one
+            and (str[1] <> 'F')
+            and (str[1] <> 'G')
+            and (str[1] <> 's')
+            and (str[1] <> 'h')
+            and (str[1] <> 'b')
+    then
     begin
         command:= lastcmd;
     end else
diff -r f012ce693681 -r eefd6d066768 hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Sat Dec 30 01:31:27 2017 +0100
+++ b/hedgewars/uStore.pas	Sun Mar 11 20:43:15 2018 +0100
@@ -815,7 +815,7 @@
         {$ENDIF}
         end;
 
-    if checkFails(ProgrTex <> nil, 'Error - Progress Texure is nil!', true) then exit;
+    if checkFails((ProgrTex <> nil) and (LoadingText <> nil), 'Error - Progress or Loading Texture is nil!', true) then exit;
 
     RenderClear();
     if Step < numsquares then
diff -r f012ce693681 -r eefd6d066768 tools/CreateMacBundle.cmake.in
--- a/tools/CreateMacBundle.cmake.in	Sat Dec 30 01:31:27 2017 +0100
+++ b/tools/CreateMacBundle.cmake.in	Sun Mar 11 20:43:15 2018 +0100
@@ -5,33 +5,14 @@
 # macdeployqt will convert safely any absolute path library for 'hedgewars'
 execute_process(COMMAND ${macdeployqt_executable} ${CMAKE_BINARY_DIR}/Hedgewars.app OUTPUT_QUIET ERROR_QUIET)
 
-if(doBundle EQUAL 1)
-    if(NOT ${NOVIDEOREC})
-        # but macdeployqt will not work for 'hwengine'
-        # luckily most the dylibs are already updated before
-        execute_process(COMMAND install_name_tool -change ${LIBAVCODEC_LIBRARY} @executable_path/../Frameworks/libavcodec.dylib ${engine_full_path})
-        execute_process(COMMAND install_name_tool -change ${LIBAVFORMAT_LIBRARY} @executable_path/../Frameworks/libavformat.dylib ${engine_full_path})
-        execute_process(COMMAND install_name_tool -change ${LIBAVUTIL_LIBRARY} @executable_path/../Frameworks/libavutil.dylib ${engine_full_path})
-    endif()
+# but macdeployqt will not work for a second executable, so employ this series of ridiculous commands to work around it
+execute_process(COMMAND mv ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/hedgewars ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/tmp)
+execute_process(COMMAND mv ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/hwengine ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/hedgewars)
+execute_process(COMMAND ${macdeployqt_executable} ${CMAKE_BINARY_DIR}/Hedgewars.app OUTPUT_QUIET ERROR_QUIET)
+execute_process(COMMAND mv ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/hedgewars ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/hwengine)
+execute_process(COMMAND mv ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/tmp ${CMAKE_BINARY_DIR}/Hedgewars.app/Contents/MacOS/hedgewars)
 
-    if(NOT ${NOPNG})
-        # same here, for libpng and hwengine, let's assume the version pulled
-        # by macdeployqt matches (yes, libpng is pulled in by macdeployqt even
-        # when NOVIDEOREC is ON)
-        execute_process(COMMAND install_name_tool -change ${PNG_LIBRARY} @executable_path/../Frameworks/${PNG_LIBNAME} ${engine_full_path})
-        execute_process(COMMAND install_name_tool -change ${ZLIB_LIBRARY} @executable_path/../Frameworks/${ZLIB_LIBNAME} ${engine_full_path})
-    endif()
-
-    execute_process(COMMAND cp ${PNG_LIBRARY} ${frameworks_dir})
-
-    execute_process(COMMAND cp -pPR ${sdl_library_only}  ${frameworks_dir})
-    execute_process(COMMAND cp -pPR ${SDL2_IMAGE_LIBRARIES} ${frameworks_dir})
-    execute_process(COMMAND cp -pPR ${SDL2_NET_LIBRARIES}   ${frameworks_dir})
-    execute_process(COMMAND cp -pPR ${SDL2_TTF_LIBRARIES}   ${frameworks_dir})
-    execute_process(COMMAND cp -pPR ${SDL2_MIXER_LIBRARIES} ${frameworks_dir})
-    execute_process(COMMAND cp -pPR ${OGG_LIBRARY}       ${frameworks_dir})
-    execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY}    ${frameworks_dir})
-
+if(doBundle EQUAL 1)
     if(${SPARKLE_FOUND})
         execute_process(COMMAND cp -pPR ${SPARKLE_LIBRARY} ${frameworks_dir})
     endif()