# HG changeset patch
# User unc0rr
# Date 1516145554 -3600
# Node ID ff54aca22bb59a3c69f8941b292a4021462479b3
# Parent  9cb98c97fbcb60f70a1ea36a3a7cf7faaac2aa37
Proper rejoin desyncs fix now

diff -r 9cb98c97fbcb -r ff54aca22bb5 hedgewars/uIO.pas
--- a/hedgewars/uIO.pas	Tue Jan 16 00:42:06 2018 +0100
+++ b/hedgewars/uIO.pas	Wed Jan 17 00:32:34 2018 +0100
@@ -72,7 +72,14 @@
 function AddCmd(Time: Word; str: shortstring): PCmd;
 var command: PCmd;
 begin
-    if (lastcmd <> nil) and (lastcmd^.cmd = '+') and (str[1] <> 'F') and (str[1] <> 'G') 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