--- 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
--- 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