ab312c47dc3

# HG changeset patch
# User nemo
# Date 1544020711 18000
# Node ID 2ab312c47dc30dc00a25a35acd599104b7237f28
# Parent  a7769dbd7088504c11673d2d7b1e258838c3ce01
make pas2c function without haskell aborting if locale is C

Gbp-Pq: Name 2ab312c47dc3.patch

diff --git a/hedgewars/uChat.pas b/hedgewars/uChat.pas
index e5d0f61fbac94b75afbb8e129b45b3dfbfe379d1..a13b9ee15aa85779dea2a001e5bce2e2d418c5c4 100644 (file)
--- a/hedgewars/uChat.pas
+++ b/hedgewars/uChat.pas
@@ -515,7 +515,7 @@ if (s[1] = '/') then
         exit
         end;
 
-    // “/clan” or “/team” (“/team” is an alias for “/clan”)
+    // "/clan" or "/team" ("/team" is an alias for "/clan")
     if ((copy(s, 2, 5) = 'clan ') or (copy(s, 2, 5) = 'team ')) then
         begin
         if (Length(s) > 6) then

diff --git a/hedgewars/uGearsHedgehog.pas b/hedgewars/uGearsHedgehog.pas
index ffaca4ee13e319b2b49f77b6f5da3343f2190780..8d5250b47273811849780fa2faa9579f37397cb6 100644 (file)
--- a/hedgewars/uGearsHedgehog.pas
+++ b/hedgewars/uGearsHedgehog.pas
@@ -775,7 +775,7 @@ begin
         if (ammo = amNothing) or (cnt = 0) then
             s:= trmsg[sidEmptyCrate]
         else if cnt >= AMMO_INFINITE then
-            s:= name + ansistring(' (+∞)')
+            s:= name + ansistring(' (+' + char($E2) + char($88) + char($9E) +')')
         else
             s:= name + ansistring(' (+' + IntToStr(cnt) + ')');
 

diff --git a/hedgewars/uInputHandler.pas b/hedgewars/uInputHandler.pas
index 9e1ba3f8b54c57b67277cf5fa18e6e981f52393b..ac4e4d550f7641c2579664df35ea38371b421691 100644 (file)
--- a/hedgewars/uInputHandler.pas
+++ b/hedgewars/uInputHandler.pas
@@ -130,7 +130,7 @@ begin
         begin
         name:= SDL_GetKeyName(SDL_GetKeyFromScancode(code));
         if (name = 'Escape') then
-            // Let's shorten the name “Escape” for the quit menu
+            // Let's shorten the name "Escape" for the quit menu
             KeyBindToName:= 'Esc'
         else if (length(name) <> 0) then
             KeyBindToName:= name

diff --git a/hedgewars/uScript.pas b/hedgewars/uScript.pas
index b2470b63fe8c3f3e249b8d611df8407816b577e2..fff958343b713ff31e58e0d1a458346a66b3a266 100644 (file)
--- a/hedgewars/uScript.pas
+++ b/hedgewars/uScript.pas
@@ -3593,7 +3593,6 @@ var locSum: LongWord;
 var braceCount: LongWord;
 var wordCount: LongWord;
 var lastChar: char;
-// ⭒⭐⭒✨⭐⭒✨⭐☆✨⭐✨✧✨☆✨✧✨☆⭒✨☆⭐⭒☆✧✨⭒✨⭐✧⭒☆⭒✧☆✨✧⭐☆✨☆✧⭒✨✧⭒☆⭐☆✧
 function  ScriptReader(L: Plua_State; f: PFSFile; sz: Psize_t) : PChar; Cdecl;
 var mybuf: PChar;
     i: LongInt;
@@ -3658,7 +3657,6 @@ begin
         end;
     ScriptLocaleReader:= mybuf
 end;
-// ⭒⭐⭒✨⭐⭒✨⭐☆✨⭐✨✧✨☆✨✧✨☆⭒✨☆⭐⭒☆✧✨⭒✨⭐✧⭒☆⭒✧☆✨✧⭐☆✨☆✧⭒✨✧⭒☆⭐☆✧
 
 function ScriptLoad(name : shortstring; mustExist : boolean): boolean;
 var ret : LongInt;

diff --git a/hedgewars/uSound.pas b/hedgewars/uSound.pas
index a6845a6c72b10e3b1ae09dc56030814debee5f50..adc34c6e0831c4d6617d47f10389e107b6b2d806 100644 (file)
--- a/hedgewars/uSound.pas
+++ b/hedgewars/uSound.pas
@@ -475,7 +475,7 @@ end;
 // Get a fallback voice, assuming that snd is not available. Returns sndNone if none is found.
 function GetFallbackV(snd: TSound): TSound;
 begin
-    // Fallback to sndFirePunch1 / sndOw1 / sndOoff1 if a “higher-numbered” sound is missing
+    // Fallback to sndFirePunch1 / sndOw1 / sndOoff1 if a "higher-numbered" sound is missing
     if (snd in [sndFirePunch2, sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6]) then
         GetFallbackV := sndFirePunch1
     else if (snd in [sndOw2, sndOw3, sndOw4, sndOuch]) then

diff --git a/hedgewars/uStats.pas b/hedgewars/uStats.pas
index 9e50da2f49424292b8560c891caba6f3f05316ef..41c5a15fa9fbaa00e00b8aa90cd030986f2c611e 100644 (file)
--- a/hedgewars/uStats.pas
+++ b/hedgewars/uStats.pas
@@ -527,7 +527,7 @@ if SendHealthStatsOn then
             deathEntry:= deathEntry^.NextEntry;
             end;
 
-    // “Achievements” / Details part of stats screen
+    // "Achievements" / Details part of stats screen
     if SendAchievementsStatsOn then
         begin
         if msdhh <> nil then

diff --git a/hedgewars/uTeams.pas b/hedgewars/uTeams.pas
index 88b27eda6a75303041a3bceddae09ba5761858c0..23b583ff09c3130795d10f5b1d3f08280fea109a 100644 (file)
--- a/hedgewars/uTeams.pas
+++ b/hedgewars/uTeams.pas
@@ -123,7 +123,7 @@ if not TeamsGameOver then
                 // Write victory message for caption and stats page
                 if (TeamsNumber = cMaxTeams) or (TeamsCount = TeamsNumber) then
                     begin
-                    // No enemies for some reason … Everyone wins!!1!
+                    // No enemies for some reason ... Everyone wins!!1!
                     s:= trmsg[sidWinnerAll];
                     allWin:= true;
                     end