Proper rejoin desyncs fix now 0.9.23
authorunc0rr
Wed, 17 Jan 2018 00:32:34 +0100
branch0.9.23
changeset 12894 ff54aca22bb5
parent 12893 9cb98c97fbcb
child 12895 c77d75dafe2e
Proper rejoin desyncs fix now
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