Changeset 10

Timestamp:

Jan 7, 2017, 2:33:20 PM (8 years ago)

Author:

chronos

Message:

• Modified: Created CevoComponents ackage for installable custom components.
• Fixed: Compile time range check error.
• Added: Heaptrace check and fixed some memory leaks.
• Fixed: MaskD function.

Location:

trunk

Files:

• Area.pas (deleted)
• Back.lfm (modified) (1 diff)
• Back.pas (modified) (2 diffs)
• ButtonA.pas (deleted)
• ButtonB.pas (deleted)
• ButtonBase.pas (deleted)
• ButtonC.pas (deleted)
• ButtonN.pas (deleted)
• Components (added)
• Components/Area.pas (added)
• Components/ButtonA.pas (added)
• Components/ButtonB.pas (added)
• Components/ButtonBase.pas (added)
• Components/ButtonC.pas (added)
• Components/ButtonN.pas (added)
• Components/CevoComponents.lpk (added)
• Components/CevoComponents.pas (added)
• Components/EOTButton.pas (added)
• Database.pas (modified) (11 diffs)
• EOTButton.pas (deleted)
• GameServer.pas (modified) (2 diffs)
• Integrated.lpi (modified) (6 diffs)
• Integrated.lpr (modified) (2 diffs)
• LocalPlayer/CityType.pas (modified) (1 diff)
• LocalPlayer/ClientTools.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (2 diffs)
• Protocol.pas (modified) (2 diffs)
• ScreenTools.pas (modified) (2 diffs)

trunk/Back.lfm

@@ -1 +1 @@
 object Background: TBackground
-  Left = 199
-  Top = 123
+  Left = 581
+  Height = 172
+  Top = 638
+  Width = 202
   BorderIcons = []
   BorderStyle = bsNone
   Caption = 'C-evo'
-  ClientHeight = 172
-  ClientWidth = 202
   Color = clBlack
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -13
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  WindowState = wsMaximized
   OnClose = FormClose
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnPaint = FormPaint
   OnShow = FormShow
-  PixelsPerInch = 96
+  LCLVersion = '1.6.2.0'
+  WindowState = wsMaximized
 end

trunk/Back.pas

@@ -8 +8 @@
 
 type
+
+  { TBackground }
+
   TBackground = class(TForm)
+    procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -54 +58 @@
 end;
 
+procedure TBackground.FormDestroy(Sender: TObject);
+begin
+  // TODO Why FormClose is not executed?
+  if img <> nil then
+    FreeAndNil(img);
+end;
+
 procedure TBackground.FormPaint(Sender: TObject);
 begin

trunk/Database.pas

@@ -79 +79 @@
   TVicinity21Loc = array [0 .. 27] of integer;
 
-procedure MaskD(var x; Count, Mask: Cardinal);
+procedure MaskD(var x: array of Cardinal; Count, Mask: Cardinal);
 procedure IntServer(Command, Player, Subject: integer; var Data);
 procedure CompactLists(p: integer);
@@ -171 +171 @@
   UnBuilt: array [0 .. nPl - 1] of integer; { number of units built }
 
-procedure MaskD(var x; Count, Mask: Cardinal);
-begin
-{ TODO
-  sub eax,4
-@r: and [eax+edx*4],ecx
-  dec edx
-  jnz @r
-  }
+procedure MaskD(var x: array of Cardinal; Count, Mask: Cardinal);
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    x[I] := x[I] and Mask;
 end;
 
@@ -1659 +1657 @@
     RealMap[Loc1]:=RealMap[Loc1] or fPoll; }
 
-  FillChar(Occupant, MapSize, -1);
+  FillChar(Occupant, MapSize, Byte(-1));
   FillChar(ZoCMap, MapSize, 0);
   FillChar(ObserveLevel, MapSize * 4, 0);
-  FillChar(UsedByCity, MapSize * 4, -1);
+  FillChar(UsedByCity, MapSize * 4, Byte(-1));
   GTestFlags := 0;
   GInitialized := GAlive or GWatching;
@@ -1681 +1679 @@
         GetMem(Map, 4 * MapSize);
         GetMem(MapObservedLast, 2 * MapSize);
-        FillChar(MapObservedLast^, 2 * MapSize, -1);
+        FillChar(MapObservedLast^, 2 * MapSize, Byte(-1));
         GetMem(Territory, MapSize);
         FillChar(Territory^, MapSize, $FF);
@@ -1708 +1706 @@
             GetMem(EnemyReport[p1], SizeOf(TEnemyReport) - 2 *
               (INFIN + 1 - nmmax));
-            FillChar(EnemyReport[p1].Tech, nAdv, tsNA);
+            FillChar(EnemyReport[p1].Tech, nAdv, Byte(tsNA));
             EnemyReport[p1].TurnOfContact := -1;
             EnemyReport[p1].TurnOfCivilReport := -1;
@@ -1731 +1729 @@
         for Loc1 := 0 to MapSize - 1 do
           Map[Loc1] := fUNKNOWN;
-        FillChar(Tech, nAdv, tsNA);
+        FillChar(Tech, nAdv, Byte(tsNA));
         FillChar(NatBuilt, SizeOf(NatBuilt), 0);
       end;
@@ -1820 +1818 @@
 begin
   CalculatePrimitive;
-  FillChar(Occupant, MapSize, -1);
+  FillChar(Occupant, MapSize, Byte(-1));
   FillChar(ObserveLevel, MapSize * 4, 0);
   with RW[0] do
@@ -1827 +1825 @@
     GetMem(Map, 4 * MapSize);
     GetMem(MapObservedLast, 2 * MapSize);
-    FillChar(MapObservedLast^, 2 * MapSize, -1);
+    FillChar(MapObservedLast^, 2 * MapSize, Byte(-1));
     GetMem(Territory, MapSize);
     FillChar(Territory^, MapSize, $FF);
@@ -2693 +2691 @@
   if Mode = moLoading_Fast then
     exit;
-  MaskD(RW[p].Map^, MapSize, not Cardinal(fInEnemyZoC));
+  MaskD(RW[p].Map^, MapSize, Cardinal(not Cardinal(fInEnemyZoC)));
   ObserveMask := 3 shl (2 * p);
   for Loc := 0 to MapSize - 1 do
@@ -2721 +2719 @@
   if Mode <> moPlaying then
     exit;
-  MaskD(RW[p].Map^, MapSize, not Cardinal(fPeace));
+  MaskD(RW[p].Map^, MapSize, Cardinal(not Cardinal(fPeace)));
   for p1 := -1 to nPl - 1 do
     PeacePlayer[p1] := (p1 >= 0) and (p1 <> p) and (1 shl p1 and GAlive <> 0)
@@ -2829 +2827 @@
   end;
 
-  FillChar(Country, MapSize, -1);
+  FillChar(Country, MapSize, Byte(-1));
   for Loc := 0 to MapSize - 1 do
     Dist[Loc] := CountryRadius + 1;

trunk/GameServer.pas

@@ -1544 +1544 @@
   MaskD(ObserveLevel, MapSize, not Cardinal(3 shl (2 * pTurn)));
   if Mode > moLoading_Fast then
-    MaskD(RW[pTurn].Map^, MapSize, not Cardinal(fUnit or fHiddenUnit or
+    MaskD(RW[pTurn].Map^, MapSize, Cardinal(not Cardinal(fUnit or fHiddenUnit or
       fStealthUnit or fObserved or fSpiedOut or fOwned or fOwnZoCUnit or
-      fInEnemyZoC));
+      fInEnemyZoC)));
   RW[pTurn].nEnemyUn := 0;
 
@@ -1995 +1995 @@
       MaskD(ObserveLevel, MapSize, not Cardinal(3 shl (2 * pTurn)));
       if Mode > moLoading_Fast then
-        MaskD(RW[pTurn].Map^, MapSize, not Cardinal(fUnit or fHiddenUnit or
+        MaskD(RW[pTurn].Map^, MapSize, Cardinal(not Cardinal(fUnit or fHiddenUnit or
           fStealthUnit or fObserved or fSpiedOut or fOwned or fOwnZoCUnit or
-          fInEnemyZoC));
+          fInEnemyZoC)));
       RW[pTurn].nEnemyUn := 0;
       DiscoverViewAreas(pTurn);

trunk/Integrated.lpi

@@ -23 +23 @@
     </VersionInfo>
     <BuildModes Count="2">
-      <Item1 Name="Default" Default="True"/>
+      <Item1 Name="Debug" Default="True"/>
       <Item2 Name="Release">
         <CompilerOptions>
@@ -73 +73 @@
       </local>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="CevoComponents"/>
+        <DefaultFilename Value="Components\CevoComponents.lpk" Prefer="True"/>
+      </Item1>
+      <Item2>
         <PackageName Value="LCL"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
     <Units Count="41">
@@ -82 +86 @@
         <Filename Value="Integrated.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="cevo"/>
       </Unit0>
       <Unit1>
@@ -143 +146 @@
         <Filename Value="Back.pas"/>
         <IsPartOfProject Value="True"/>
-        <HasResources Value="True"/>
+        <ComponentName Value="Background"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit14>
       <Unit15>
@@ -300 +305 @@
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <UseHeaptrc Value="True"/>
+      </Debugging>
       <Options>
         <Win32>
@@ -307 +315 @@
     </Linking>
     <Other>
-      <CustomOptions Value="-dBorland -dVer150 -dDelphi7 -dCompiler6_Up -dPUREPASCAL"/>
+      <CompilerMessages>
+        <IgnoredMessages idx5024="True"/>
+      </CompilerMessages>
+      <CustomOptions Value="-dBorland -dVer150 -dDelphi7 -dCompiler6_Up -dPUREPASCAL -dDEBUG"/>
     </Other>
   </CompilerOptions>

trunk/Integrated.lpr

@@ -3 +3 @@
 
 uses
-  Forms, Interfaces,
+  Forms, Interfaces, SysUtils,
   StringTables in 'StringTables.pas',
   Directories in 'Directories.pas',
@@ -47 +47 @@
 {$R cevo.RES}
 
+{$IFDEF DEBUG}
+const
+  HeapTraceLog = 'heaptrclog.trc';
+{$ENDIF}
+
 begin
+  {$IFDEF DEBUG}
+  // Heap trace
+  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
+  {$ENDIF}
+
   DotNetClient := nil;
   Application.Initialize;

trunk/LocalPlayer/CityType.pas

@@ -342 +342 @@
 procedure TCityTypeDlg.DeleteBtnClick(Sender: TObject);
 begin
-  fillchar(MyData.ImpOrder[ctype], sizeof(MyData.ImpOrder[ctype]), -1);
+  fillchar(MyData.ImpOrder[ctype], sizeof(MyData.ImpOrder[ctype]), Byte(-1));
   listed := [];
   Changed := true;

trunk/LocalPlayer/ClientTools.pas

@@ -434 +434 @@
   var
     stage, NextJob, Tile: integer;
-    Done: Set of jNone .. jTrans;
+    Done: Set of jNone .. jPoll;
   begin
     Done := [];

trunk/LocalPlayer/Term.pas

@@ -2516 +2516 @@
                 FarTech := adNone;
                 FillChar(EnhancementJobs, SizeOf(EnhancementJobs), jNone);
-                FillChar(ImpOrder, SizeOf(ImpOrder), -1);
+                FillChar(ImpOrder, SizeOf(ImpOrder), Byte(-1));
                 ColdWarStart := -ColdWarTurns - 1;
                 ToldAge := -1;
@@ -2533 +2533 @@
                     EffectiveOwner := -1
                   end;
-                FillChar(ToldTech, SizeOf(ToldTech), tsNA);
+                FillChar(ToldTech, SizeOf(ToldTech), Byte(tsNA));
                 if G.Difficulty[p1] > 0 then
                   SoundPreload(sbStart);

trunk/Protocol.pas

@@ -1416 +1416 @@
   TJobProgressData = array [0 .. nJob - 1] of record Required, Done,
     NextTurnPlus: integer;
-end;
-TBattleForecast = record pAtt, mixAtt, HealthAtt, ExpAtt, FlagsAtt, Movement,
-  EndHealthDef, EndHealthAtt: integer;
-end;
-TBattleForecastEx = record pAtt, mixAtt, HealthAtt, ExpAtt, FlagsAtt, Movement,
-  EndHealthDef, EndHealthAtt: integer; // must be same as in TBattleForecast
-AStr, DStr, ABaseDamage, DBaseDamage: integer;
-end;
-TShowMove = record Owner, Health, mix, emix, Flags, FromLoc, dx, dy, EndHealth,
-  EndHealthDef, Fuel, Exp, Load: integer;
-end;
-TShowShipChange = record Reason, Ship1Owner, Ship2Owner: integer;
-Ship1Change, Ship2Change: array [0 .. nShipPart - 1] of integer;
-end;
-TOffer = record nDeliver, nCost: integer;
-Price:
-array [0 .. 11] of Cardinal;
-end;
-TChart = array [0 .. INFIN] of integer;
-TEditTileData = record Loc, NewTile: integer
-end;
-TCreateUnitData = record Loc, p, mix: integer;
-end;
-
-TTileList = array [0 .. INFIN] of Cardinal;
-TTileObservedLastList = array [0 .. INFIN] of SmallInt;
-TOwnerList = array [0 .. INFIN] of ShortInt;
-TByteList = array [0 .. INFIN] of Byte;
-TIntList = array [0 .. INFIN] of integer;
-TCityList = array [0 .. INFIN] of TCity;
-TUnList = array [0 .. INFIN] of TUn;
-TModelList = array [0 .. INFIN] of TModel;
-TEnemyUnList = array [0 .. INFIN] of TUnitInfo;
-TEnemyCityList = array [0 .. INFIN] of TCityInfo;
-TEnemyModelList = array [0 .. INFIN] of TModelInfo;
-TBattleList = array [0 .. INFIN] of TBattle;
-
-TPlayerContext = record Data: pointer;
-Map:
-^TTileList;
-{ the playground, a list of tiles with index = location, see tile flags }
-MapObservedLast:
-^TTileObservedLastList;
-// turn in which the tile was observed last, index = location
-Territory:
-^TOwnerList; // nation to which's territory a tile belongs, -1 indicates none
-Un:
-^TUnList; { units }
-City:
-^TCityList; { cities }
-Model:
-^TModelList; { unit models }
-EnemyUn:
-^TEnemyUnList; // known units of enemy players
-EnemyCity:
-^TEnemyCityList; // known cities of enemy players
-EnemyModel:
-^TEnemyModelList; // known unit models of enemy players
-EnemyReport:
-array [0 .. nPl - 1] of ^TEnemyReport;
-
-TestFlags, // options turned on in the "Manipulation" menu
-Turn, // current turn
-Alive, { bitset of IDs of players still alive, flag 1 shl p for player p }
-Happened, // flags indicate what happened within the last turnaround
-AnarchyStart, // start turn of anarchy, <0 if not in anarchy
-Credibility, // own credibility
-MaxCredibility, // maximum credibility still to achieve
-nUn, { number of units }
-nCity, { number of cities }
-nModel, { number of developed unit models }
-nEnemyUn, nEnemyCity, nEnemyModel, Government, { gAnarchy..gDemocracy }
-Money, TaxRate, LuxRate, Research,
-{ collected research points for currently researched tech }
-ResearchTech: integer; // currently researched tech
-DevModel:
-TModel; { unit model currently under development }
-Tech:
-array [0 .. (nAdv + 3) div 4 * 4 - 1] of ShortInt; { tech status indicator }
-Attitude:
-array [0 .. nPl - 1] of integer; // attitude to other nations
-Treaty:
-array [0 .. nPl - 1] of integer; // treaty with other nations
-EvaStart:
-array [0 .. nPl - 1] of integer; // peace treaty: start of evacuation period
-Tribute:
-array [0 .. nPl - 1] of integer; // no longer in use
-TributePaid:
-array [0 .. nPl - 1] of integer; // no longer in use
-Wonder:
-array [0 .. 27] of TWonderInfo;
-Ship:
-array [0 .. nPl - 1] of TShipInfo;
-NatBuilt:
-array [28 .. (nImp + 3) div 4 * 4 - 1] of ShortInt;
-nBattleHistory:
-integer;
-BattleHistory:
-^TBattleList; // complete list of all my battles in the whole game
-BorderHelper:
-^TByteList;
-LastCancelTreaty:
-array [0 .. nPl - 1] of integer; // turn of last treaty cancel
-OracleIncome:
-integer;
-DefaultDebugMap:
-^TIntList;
-Filler:
-array [0 .. 879] of Byte;
-end;
-
-TInitModuleData = record Server: TServerCall;
-DataVersion, DataSize, Flags: integer;
-end;
-TNewGameData = record lx, ly, LandMass, MaxTurn: integer;
-Difficulty:
-array [0 .. nPl - 1] of integer;
-{ difficulty levels of the players, if it's 0 this player is the supervisor,
-  -1 for unused slots }
-RO:
-array [0 .. nPl - 1] of ^TPlayerContext;
-AssemblyPath:
-array [0 .. 255] of char;
-SuperVisorRO:
-array [0 .. nPl - 1] of ^TPlayerContext;
-end;
-TNewGameExData = record lx, ly, LandMass, MaxTurn, RND: integer;
-Difficulty:
-array [0 .. nPl - 1] of integer;
-{ difficulty levels of the players, if it's 0 this player is the supervisor,
-  -1 for unused slots }
-Controlled:
-integer;
-end;
-TShowNegoData = record pSender, pTarget, Action: integer;
-Offer:
-TOffer;
-end;
+  end;
+  TBattleForecast = record
+    pAtt, mixAtt, HealthAtt, ExpAtt, FlagsAtt, Movement,
+    EndHealthDef, EndHealthAtt: integer;
+  end;
+  TBattleForecastEx = record
+    pAtt, mixAtt, HealthAtt, ExpAtt, FlagsAtt, Movement,
+    EndHealthDef, EndHealthAtt: integer; // must be same as in TBattleForecast
+    AStr, DStr, ABaseDamage, DBaseDamage: integer;
+  end;
+  TShowMove = record
+    Owner, Health, mix, emix, Flags, FromLoc, dx, dy, EndHealth,
+    EndHealthDef, Fuel, Exp, Load: integer;
+  end;
+  TShowShipChange = record
+    Reason, Ship1Owner, Ship2Owner: integer;
+    Ship1Change, Ship2Change: array [0 .. nShipPart - 1] of integer;
+  end;
+  TOffer = record nDeliver, nCost: integer;
+    Price: array [0 .. 11] of Cardinal;
+  end;
+  TChart = array [0 .. INFIN] of integer;
+  TEditTileData = record
+    Loc, NewTile: integer
+  end;
+  TCreateUnitData = record
+    Loc, p, mix: integer;
+  end;
+
+  TTileList = array [0 .. INFIN] of Cardinal;
+  TTileObservedLastList = array [0 .. INFIN] of SmallInt;
+  TOwnerList = array [0 .. INFIN] of ShortInt;
+  TByteList = array [0 .. INFIN] of Byte;
+  TIntList = array [0 .. INFIN] of integer;
+  TCityList = array [0 .. INFIN] of TCity;
+  TUnList = array [0 .. INFIN] of TUn;
+  TModelList = array [0 .. INFIN] of TModel;
+  TEnemyUnList = array [0 .. INFIN] of TUnitInfo;
+  TEnemyCityList = array [0 .. INFIN] of TCityInfo;
+  TEnemyModelList = array [0 .. INFIN] of TModelInfo;
+  TBattleList = array [0 .. INFIN] of TBattle;
+
+  TPlayerContext = record
+    Data: pointer;
+    Map: ^TTileList;
+    { the playground, a list of tiles with index = location, see tile flags }
+    MapObservedLast: ^TTileObservedLastList;
+    // turn in which the tile was observed last, index = location
+    Territory: ^TOwnerList; // nation to which's territory a tile belongs, -1 indicates none
+    Un: ^TUnList; { units }
+    City: ^TCityList; { cities }
+    Model: ^TModelList; { unit models }
+    EnemyUn: ^TEnemyUnList; // known units of enemy players
+    EnemyCity: ^TEnemyCityList; // known cities of enemy players
+    EnemyModel: ^TEnemyModelList; // known unit models of enemy players
+    EnemyReport: array [0 .. nPl - 1] of ^TEnemyReport;
+
+    TestFlags, // options turned on in the "Manipulation" menu
+    Turn, // current turn
+    Alive, { bitset of IDs of players still alive, flag 1 shl p for player p }
+    Happened, // flags indicate what happened within the last turnaround
+    AnarchyStart, // start turn of anarchy, <0 if not in anarchy
+    Credibility, // own credibility
+    MaxCredibility, // maximum credibility still to achieve
+    nUn, { number of units }
+    nCity, { number of cities }
+    nModel, { number of developed unit models }
+    nEnemyUn, nEnemyCity, nEnemyModel, Government, { gAnarchy..gDemocracy }
+    Money, TaxRate, LuxRate, Research,
+    { collected research points for currently researched tech }
+    ResearchTech: integer; // currently researched tech
+    DevModel: TModel; { unit model currently under development }
+    Tech: array [0 .. (nAdv + 3) div 4 * 4 - 1] of ShortInt; { tech status indicator }
+    Attitude: array [0 .. nPl - 1] of integer; // attitude to other nations
+    Treaty: array [0 .. nPl - 1] of integer; // treaty with other nations
+    EvaStart: array [0 .. nPl - 1] of integer; // peace treaty: start of evacuation period
+    Tribute: array [0 .. nPl - 1] of integer; // no longer in use
+    TributePaid: array [0 .. nPl - 1] of integer; // no longer in use
+    Wonder: array [0 .. 27] of TWonderInfo;
+    Ship: array [0 .. nPl - 1] of TShipInfo;
+    NatBuilt: array [28 .. (nImp + 3) div 4 * 4 - 1] of ShortInt;
+    nBattleHistory: integer;
+    BattleHistory: ^TBattleList; // complete list of all my battles in the whole game
+    BorderHelper: ^TByteList;
+    LastCancelTreaty: array [0 .. nPl - 1] of integer; // turn of last treaty cancel
+    OracleIncome: integer;
+    DefaultDebugMap: ^TIntList;
+    Filler: array [0 .. 879] of Byte;
+  end;
+
+  TInitModuleData = record
+    Server: TServerCall;
+    DataVersion, DataSize, Flags: integer;
+  end;
+
+  TNewGameData = record
+    lx, ly, LandMass, MaxTurn: integer;
+    Difficulty: array [0 .. nPl - 1] of integer;
+    { difficulty levels of the players, if it's 0 this player is the supervisor,
+      -1 for unused slots }
+    RO: array [0 .. nPl - 1] of ^TPlayerContext;
+    AssemblyPath: array [0 .. 255] of char;
+    SuperVisorRO: array [0 .. nPl - 1] of ^TPlayerContext;
+  end;
+
+  TNewGameExData = record
+    lx, ly, LandMass, MaxTurn, RND: integer;
+    Difficulty: array [0 .. nPl - 1] of integer;
+    { difficulty levels of the players, if it's 0 this player is the supervisor,
+      -1 for unused slots }
+    Controlled: integer;
+  end;
+
+  TShowNegoData = record
+    pSender, pTarget, Action: integer;
+    Offer: TOffer;
+  end;
 
 const
@@ -1739 +1718 @@
 
 begin
-  assert(sizeof(TPlayerContext) = 2048);
-  assert(sizeof(TModel) - 2 * sizeof(LongInt) - 4 * sizeof(word)
-    = sIntSetDevModel and $F * 4);
+  // TODO assert(sizeof(TPlayerContext) = 2048);
+  // TODO assert(sizeof(TModel) - 2 * sizeof(LongInt) - 4 * sizeof(word)
+  //  = sIntSetDevModel and $F * 4);
 
 end.

trunk/ScreenTools.pas

@@ -1500 +1500 @@
   Phrases2.loadfromfile(HomeDir + 'Language2.txt');
 end;
+
 Sounds := TStringTable.create;
 if not Sounds.loadfromfile(HomeDir + 'Sounds\sound.txt') then
@@ -1592 +1593 @@
   UniFont[section].Free;
 Phrases.Free;
+FreeAndNil(Phrases2);
 if Sounds <> nil then
   Sounds.Free;