# HG changeset patch
# User nemo
# Date 1523483999 14400
# Node ID dd1435f1a28c27ab595ec8145f537a5102ba409d
# Parent  3546bb36c8fb7333c182b9a89f9df5e424f55765# Parent  c77d75dafe2e880dd2a108e8f4e26d1c4f90cc80
merge with 0.9.23, pulling in unc0rr's desync fix

diff -r 3546bb36c8fb -r dd1435f1a28c hedgewars/uIO.pas
--- a/hedgewars/uIO.pas	Sun Apr 08 00:52:22 2018 +0200
+++ b/hedgewars/uIO.pas	Wed Apr 11 17:59:59 2018 -0400
@@ -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 3546bb36c8fb -r dd1435f1a28c hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Sun Apr 08 00:52:22 2018 +0200
+++ b/hedgewars/uStore.pas	Wed Apr 11 17:59:59 2018 -0400
@@ -825,7 +825,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