--- a/hedgewars/uGears.pas Sat Oct 06 01:24:27 2018 +0300
+++ b/hedgewars/uGears.pas Fri Oct 05 21:43:48 2018 -0400
@@ -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
--- a/hedgewars/uGearsHedgehog.pas Sat Oct 06 01:24:27 2018 +0300
+++ b/hedgewars/uGearsHedgehog.pas Fri Oct 05 21:43:48 2018 -0400
@@ -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;
--- a/hedgewars/uScript.pas Sat Oct 06 01:24:27 2018 +0300
+++ b/hedgewars/uScript.pas Fri Oct 05 21:43:48 2018 -0400
@@ -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;
--- a/hedgewars/uTeams.pas Sat Oct 06 01:24:27 2018 +0300
+++ b/hedgewars/uTeams.pas Fri Oct 05 21:43:48 2018 -0400
@@ -782,7 +782,7 @@
procedure chTeamGone(var s:shortstring);
var t, i: LongInt;
isSynced: boolean;
- tmp: ansistring;
+ tmp: shortstring;
begin
isSynced:= s[1] = 's';
@@ -805,7 +805,7 @@
begin
tmp:= ' ' + trmsg[sidTeamGone];
tmp:= '*' + tmp;
- AddChatString(#7 + FormatA(tmp, TeamName));
+ AddChatString(#7 + Format(tmp, TeamName));
if not CurrentTeam^.ExtDriven then SendIPC(_S'f' + s);
hasGone:= true;
skippedTurns:= 0;
@@ -828,7 +828,7 @@
procedure chTeamBack(var s:shortstring);
var t: LongInt;
isSynced: boolean;
- tmp: ansistring;
+ tmp: shortstring;
begin
isSynced:= s[1] = 's';
@@ -846,8 +846,8 @@
if hasGone then
begin
tmp:= ' '+trmsg[sidTeamBack];
- tmp:= '*'+trmsg[sidTeamBack];
- AddChatString(#8 + FormatA(tmp, TeamName));
+ tmp:= '*'+tmp;
+ AddChatString(#8 + Format(tmp, TeamName));
if not CurrentTeam^.ExtDriven then SendIPC(_S'g' + s);
hasGone:= false;