# HG changeset patch # User Wuzzy # Date 1538778207 -7200 # Node ID 26ebbf9717fdedf9f1c3d241ebbe01e5b877fdc4 # Parent 086aa3ae097fba3aeb4d83b92c2d291028532242 Make sure AddChatString is only fed with shortstrings diff -r 086aa3ae097f -r 26ebbf9717fd hedgewars/uGears.pas --- a/hedgewars/uGears.pas Fri Oct 05 23:51:58 2018 +0200 +++ b/hedgewars/uGears.pas Sat Oct 06 00:23:27 2018 +0200 @@ -1221,7 +1221,7 @@ Gear^.Text:= text; Gear^.FrameTicks:= x end; - AddChatString(#9+FormatA(trmsg[sidChatHog], ansistring(HH^.Name), ansistring(text))); + AddChatString(#9+Format(trmsg[sidChatHog], HH^.Name, text)); end end else if (x >= 4) then diff -r 086aa3ae097f -r 26ebbf9717fd hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Fri Oct 05 23:51:58 2018 +0200 +++ b/hedgewars/uGearsHedgehog.pas Sat Oct 06 00:23:27 2018 +0200 @@ -51,7 +51,7 @@ t:= 0; while (TeamsArray[t] <> CurrentTeam) do inc(t); - AddChatString(#2 + FormatA(trmsg[sidAutoSkip], CurrentTeam^.TeamName)); + AddChatString(#2 + Format(trmsg[sidAutoSkip], CurrentTeam^.TeamName)); ParseCommand('/skip', true) end; @@ -584,7 +584,7 @@ speech^.Text:= SpeechText; speech^.Hedgehog:= Gear^.Hedgehog; speech^.FrameTicks:= SpeechType; - AddChatString(#9+FormatA(trmsg[sidChatHog], Gear^.Hedgehog^.Name, SpeechText)); + AddChatString(#9+Format(trmsg[sidChatHog], Gear^.Hedgehog^.Name, SpeechText)); end; SpeechText:= '' end; diff -r 086aa3ae097f -r 26ebbf9717fd hedgewars/uScript.pas --- a/hedgewars/uScript.pas Fri Oct 05 23:51:58 2018 +0200 +++ b/hedgewars/uScript.pas Sat Oct 06 00:23:27 2018 +0200 @@ -1651,7 +1651,7 @@ vgear^.Text:= lua_tostring(L, 2); if Gear^.Kind = gtHedgehog then begin - AddChatString(#9+FormatA(trmsg[sidChatHog], gear^.Hedgehog^.Name, vgear^.text)); + AddChatString(#9+Format(trmsg[sidChatHog], gear^.Hedgehog^.Name, vgear^.text)); vgear^.Hedgehog:= gear^.Hedgehog end else vgear^.Frame:= gear^.uid;