Changeset 674 for trunk/LocalPlayer

Timestamp:

Jul 26, 2025, 8:45:36 AM (3 days ago)

Author:

chronos

Message:

• Modified: Select dialog refactored for better readability.
• Modified: Evaluate Escape key in Settings dialog.

Location:

trunk/LocalPlayer

Files:

• Nego.pas (modified) (4 diffs)
• Select.pas (modified) (77 diffs)
• Term.pas (modified) (3 diffs)

trunk/LocalPlayer/Nego.pas

@@ -392 +392 @@
     if MainScreen.ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
       MyAllowed := MyAllowed + [opAllModel shr 24];
-    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
+    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseEnemyModel) <> mixAll then
       OppoAllowed := OppoAllowed + [opAllModel shr 24];
   end;
@@ -762 +762 @@
                 Exit;
             end;
-          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kEnemyShipPart);
           if MainScreen.ModalSelectDlg.Result < 0 then
             Exit;
@@ -784 +784 @@
       opAllTech:
         begin // choose technology
-          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseEnemyTech);
           if MainScreen.ModalSelectDlg.Result < 0 then
             Exit;
@@ -794 +794 @@
       opAllModel:
         begin // choose model
-          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseEnemyModel);
           if MainScreen.ModalSelectDlg.Result < 0 then
             Exit;

trunk/LocalPlayer/Select.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, PVSB, BaseWin, LCLIntf, LCLType, Messages,
-  SysUtils, Classes, ButtonB, ButtonBase, Types, Math,
+  SysUtils, Classes, ButtonB, ButtonBase, Types, Math, Generics.Collections,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus,
   Dpi.Common, System.UITypes{$ELSE}
@@ -13 +13 @@
 type
   TListKind = (kProject, kAdvance, kFarAdvance, kCities, kCityEvents, kModels,
-    kEModels, kAllEModels, kTribe, kScience, kShipPart, kEShipPart, kChooseTech,
-    kChooseETech, kChooseModel, kChooseEModel, kChooseCity, kChooseECity,
-    kStealTech, kGov, kMission);
+    kEnemyModels, kAllEnemyModels, kTribe, kScience, kShipPart, kEnemyShipPart,
+    kChooseTech, kChooseEnemyTech, kChooseModel, kChooseEnemyModel, kChooseCity,
+    kChooseEnemyCity, kStealTech, kGovernment, kMission);
 
   TLayerIndex = (laImprovements, laWonders, laClasses);
+
+  { TLine }
+
+  TLine = class
+    Code: Integer;
+    Model: Integer;
+    ModelSortValue: Integer;
+    procedure Assign(Source: TLine);
+  end;
 
   { TLayer }
@@ -23 +32 @@
   TLayer = class
     Index: TLayerIndex;
-    Lines: Integer;
     FirstShrinkedLine: Integer;
-    Code: array [0..4095] of Integer;
-    procedure SwapCode(I, J: Integer);
+    Lines: TObjectList<TLine>;
+    procedure AddLine(Code: Integer; Model: Integer = 0; ModelSortValue: Integer = 0);
+    procedure SwapLine(I, J: Integer);
+    procedure SortModels;
+    procedure SortCities;
+    procedure SortTechs;
     constructor Create(AIndex: TLayerIndex);
-    procedure AddCode(Value: Integer);
+    destructor Destroy; override;
   end;
 
@@ -62 +74 @@
     MaxLines: Integer;
     cixProject: Integer;
-    pView: Integer;
+    PlayerView: Integer;
     Selected: Integer;
     DispLines: Integer;
@@ -78 +90 @@
     procedure ScrollBarUpdate(Sender: TObject);
     procedure InitLines;
-    procedure Line(ca: TCanvas; L: Integer; NonText, Lit: Boolean);
+    procedure PaintLine(ca: TCanvas; L: Integer; NonText, Lit: Boolean);
     function RenameModel(mix: Integer): Boolean;
     procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
@@ -91 +103 @@
     procedure ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
     procedure ShowNewContent_CityProject(NewMode: TWindowMode; cix: Integer);
-    procedure ShowNewContent_MilReport(NewMode: TWindowMode; P: Integer);
+    procedure ShowNewContent_MilReport(NewMode: TWindowMode; Player: Integer);
     procedure EcoChange;
     procedure TechChange;
@@ -116 +128 @@
   CityNameSpace = 127;
 
-  MustChooseKind = [kTribe, kStealTech, kGov];
+  MustChooseKind = [kTribe, kStealTech, kGovernment];
+
+{ TLine }
+
+procedure TLine.Assign(Source: TLine);
+begin
+  Code := Source.Code;
+  Model := Source.Model;
+  ModelSortValue := Source.ModelSortValue;
+end;
 
 { TLayer }
 
-procedure TLayer.SwapCode(I, J: Integer);
+procedure TLayer.AddLine(Code: Integer; Model: Integer = 0; ModelSortValue: Integer = 0);
 var
-  Temp: Integer;
-begin
-  Temp := Code[I];
-  Code[I] := Code[J];
-  Code[J] := Temp;
+  NewLine: TLine;
+begin
+  NewLine := TLine.Create;
+  NewLine.Code := Code;
+  NewLine.Model := Model;
+  NewLine.ModelSortValue := ModelSortValue;
+  Lines.Add(NewLine);
+end;
+
+procedure TLayer.SwapLine(I, J: Integer);
+var
+  Temp: TLine;
+begin
+  Temp := TLine.Create;
+  Temp.Assign(Lines[I]);
+  Lines[I].Assign(Lines[J]);
+  Lines[J].Assign(Temp);
+  Temp.Free;
+end;
+
+procedure TLayer.SortModels;
+var
+  I, J: Integer;
+begin
+  for I := 0 to Lines.Count - 2 do
+    for J := I + 1 to Lines.Count - 1 do
+      if Lines[I].ModelSortValue > Lines[J].ModelSortValue then
+      begin
+        SwapLine(I, J);
+      end;
+end;
+
+procedure TLayer.SortTechs;
+var
+  I, J: Integer;
+begin // sort by advancedness
+  for I := 0 to Lines.Count - 2 do
+    if Lines[I].Code < adMilitary then
+      for J := I + 1 to Lines.Count - 1 do
+        if AdvValue[Lines[I].Code] * nAdv + Lines[I].Code < AdvValue[Lines[J].Code] *
+          nAdv + Lines[J].Code then
+        begin
+          SwapLine(I, J);
+        end;
+end;
+
+procedure TLayer.SortCities;
+var
+  I, J: Integer;
+begin
+  for I := 0 to Lines.Count - 2 do
+    for J := I + 1 to Lines.Count - 1 do
+      if CityName(MyCity[Lines[I].Code].ID) > CityName(MyCity[Lines[J].Code].ID) then
+      begin
+        SwapLine(I, J);
+      end;
 end;
 
 constructor TLayer.Create(AIndex: TLayerIndex);
 begin
+  Lines := TObjectList<TLine>.Create;
   Index := AIndex;
 end;
 
-procedure TLayer.AddCode(Value: Integer);
-begin
-  Code[Lines] := Value;
-  Inc(Lines);
+destructor TLayer.Destroy;
+begin
+  FreeAndNil(Lines);
+  inherited;
 end;
 
@@ -195 +268 @@
   if not Closable and (Selected <> -2) then
   begin
-    Line(Canvas, Selected, False, False);
+    PaintLine(Canvas, Selected, False, False);
     Selected := -2;
   end;
@@ -207 +280 @@
   Canvas.Font.Assign(UniFont[ftNormal]);
   if Selected <> -2 then
-    Line(Canvas, Selected, False, True);
+    PaintLine(Canvas, Selected, False, True);
   S := '';
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) then
@@ -214 +287 @@
   else if Kind = kModels then
     S := Tribe[Me].TPhrase('SHORTNAME')
-  else if Kind = kEModels then
-    S := Tribe[pView].TPhrase('SHORTNAME') + ' (' +
-      TurnToString(MyRO.EnemyReport[pView].TurnOfMilReport) + ')';
+  else if Kind = kEnemyModels then
+    S := Tribe[PlayerView].TPhrase('SHORTNAME') + ' (' +
+      TurnToString(MyRO.EnemyReport[PlayerView].TurnOfMilReport) + ')';
   if S <> '' then
     LoweredTextOut(Canvas, -1, MainTexture,
@@ -228 +301 @@
 end;
 
-procedure TListDlg.Line(ca: TCanvas; L: Integer; NonText, Lit: Boolean);
+procedure TListDlg.PaintLine(ca: TCanvas; L: Integer; NonText, Lit: Boolean);
 // paint a line
 
@@ -283 +356 @@
   CanGrow: Boolean;
 begin
-  lix := Layer.Code[ScrollBar.Position + L];
+  lix := Layer.Lines[ScrollBar.Position + L].Code;
   y0 := 2 + (L + 1) * LineDistance;
+
   if ScrollBar.Position + L >= Layer.FirstShrinkedLine then
     ofs := (ScrollBar.Position + L - Layer.FirstShrinkedLine) and 1 * 33
-  else { if FirstShrinkedLine[Layer] < Lines[Layer] then }
+  else { if Layers[Layer].FirstShrinkedLine < Layers[Layer].Lines.Count then }
     ofs := 33;
 
@@ -408 +482 @@
         else
         begin
-          { s:=IntToStr(CityReport.FoodSurplus);
-            ReplaceText(X+(CityNameSpace+4+48)-BiColorTextWidth(ca,S),Y,TextColor,S); }
+          { s := IntToStr(CityReport.FoodSurplus);
+            ReplaceText(X + (CityNameSpace + 4 + 48) - BiColorTextWidth(ca, S), Y, TextColor, S); }
           S := IntToStr(CityReport.Science);
           ReplaceText(X + CityNameSpace + 4 + 370 + 48 - BiColorTextWidth(ca,
@@ -418 +492 @@
           if NonText then
           begin
-            // Sprite(offscreen,HGrSystem,x+CityNameSpace+4+333+1,y+6,10,10,66,115);
+            // Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 333 + 1, y + 6, 10, 10, 66, 115);
             Sprite(Offscreen, HGrSystem, X + CityNameSpace + 4 + 370 + 48 + 1,
               Y + 6, 10, 10, 77, 126);
@@ -428 +502 @@
         ReplaceText(X + CityNameSpace + 4 + 370 - BiColorTextWidth(ca, S), Y,
           TextColor, S);
-        // if Project and (cpImp+cpIndex)<>cpImp+imTrGoods then
-        // ReplaceText(x+CityNameSpace+4+333+1,y,TextColor,Format('%d/%d',[TrueProd,CityReport.ProjectCost]));
+        // if Project and (cpImp + cpIndex) <> cpImp + imTrGoods then
+        // ReplaceText(x + CityNameSpace + 4 + 333 + 1, y, TextColor, Format('%d/%d', [TrueProd,CityReport.ProjectCost]));
         if NonText then
         begin
@@ -463 +537 @@
       end;
     end
-  else if Kind in [kModels, kEModels] then
+  else if Kind in [kModels, kEnemyModels] then
   begin
     X := 104;
@@ -491 +565 @@
     else
     begin
-      Available := MyRO.EnemyReport[pView].UnCount[lix];
+      Available := MyRO.EnemyReport[PlayerView].UnCount[lix];
       if MainScreen.mNames.Checked then
-        S := Tribe[pView].ModelName[lix]
+        S := Tribe[PlayerView].ModelName[lix]
       else
-        S := Format(Tribe[pView].TPhrase('GENMODEL'), [lix]);
+        S := Format(Tribe[PlayerView].TPhrase('GENMODEL'), [lix]);
       if NonText then
-        with Tribe[pView].ModelPicture[lix] do
+        with Tribe[PlayerView].ModelPicture[lix] do
           Sprite(Offscreen, HGr, 8 + ofs, y0 - 15, 64, 48, pix mod 10 * 65 + 1,
             pix div 10 * 49 + 1);
@@ -509 +583 @@
   begin
     case Kind of
-      kAllEModels, kChooseEModel:
+      kAllEnemyModels, kChooseEnemyModel:
         if lix = mixAll then
           S := Phrases.Lookup('PRICECAT_ALLMODEL')
@@ -518 +592 @@
           begin
             S := Tribe[mox.Owner].ModelName[mox.mix];
-            if (Kind = kAllEModels) and (Layers[laWonders].Code[ScrollBar.Position + L] = 0) then
+            if (Kind = kAllEnemyModels) and (Layers[laImprovements].Lines[ScrollBar.Position + L].Model = 0) then
               S := Format(Tribe[mox.Owner].TPhrase('OWNED'), [S]);
           end
@@ -561 +635 @@
             DisplayProject(8 + ofs, y0 - 15, lix);
         end;
-      kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
+      kAdvance, kFarAdvance, kScience, kChooseTech, kChooseEnemyTech, kStealTech:
         begin
           if lix = adAll then
@@ -706 +780 @@
             DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
         end;
-      kEShipPart:
+      kEnemyShipPart:
         begin
           S := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
@@ -713 +787 @@
             DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
         end;
-      kGov:
+      kGovernment:
         begin
           S := Phrases.Lookup('GOVERNMENT', lix);
@@ -730 +804 @@
     case Kind of
       kTribe, kMission: // center text
-        if Layers[laImprovements].Lines > MaxLines then
+        if Layers[laImprovements].Lines.Count > MaxLines then
           X := (InnerWidth - GetSystemMetrics(SM_CXVSCROLL)) div 2 -
             BiColorTextWidth(ca, S) div 2
         else
           X := InnerWidth div 2 - BiColorTextWidth(ca, S) div 2;
-      kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech,
-        kStealTech, kGov:
+      kAdvance, kFarAdvance, kScience, kChooseTech, kChooseEnemyTech,
+        kStealTech, kGovernment:
         X := 104 - 33;
-      kAllEModels:
+      kAllEnemyModels:
         X := 104;
     else
@@ -753 +827 @@
     else
       TextColor := -1;
-    { if Kind=kTribe then ReplaceText_Tribe(x,y,TextColor,
-      Integer(TribeNames.Objects[lix]),S)
+    { if Kind = kTribe then ReplaceText_Tribe(X, Y, TextColor,
+      Integer(TribeNames.Objects[lix]), S)
       else } ReplaceText(X, Y, TextColor, S);
   end;
@@ -803 +877 @@
 
     for I := -1 to DispLines do
-      if (I + ScrollBar.Position >= 0) and (I + ScrollBar.Position < Layer.Lines) then
-        Self.Line(Offscreen.Canvas, I, True, False);
+      if (I + ScrollBar.Position >= 0) and (I + ScrollBar.Position < Layer.Lines.Count) then
+        PaintLine(Offscreen.Canvas, I, True, False);
   end;
   MarkUsedOffscreen(InnerWidth, 8 + 48 + DispLines * LineDistance);
@@ -825 +899 @@
     Selected := -2;
   if (Selected < -1) or (Selected > DispLines) or (Selected + i0 < 0) or
-    (Selected + i0 >= Layer.Lines) then
+    (Selected + i0 >= Layer.Lines.Count) then
     Selected := -2;
   if Selected <> Sel0 then begin
     if Sel0 <> -2 then
-      Line(Canvas, Sel0, False, False);
+      PaintLine(Canvas, Sel0, False, False);
     if Selected <> -2 then
-      Line(Canvas, Selected, False, True);
+      PaintLine(Canvas, Selected, False, True);
   end;
 
@@ -952 +1026 @@
 begin
   if ScrollBar.Position + Selected >= 0 then
-    lix := Layer.Code[ScrollBar.Position + Selected];
-  if Kind in [kScience, kCities, kCityEvents, kModels, kEModels, kAllEModels]
+    lix := Layer.Lines[ScrollBar.Position + Selected].Code;
+  if Kind in [kScience, kCities, kCityEvents, kModels, kEnemyModels, kAllEnemyModels]
   then
     Include(Shift, ssShift); // don't close list window
@@ -977 +1051 @@
           if lix <> mixAll then
             MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, lix);
-        kEModels:
+        kEnemyModels:
           MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
-            Layers[laWonders].Code[ScrollBar.Position + Selected]);
-        kAllEModels, kChooseEModel:
+            Layers[laImprovements].Lines[ScrollBar.Position + Selected].Code);
+        kAllEnemyModels, kChooseEnemyModel:
           if lix <> mixAll then
             MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent, lix);
-        kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
+        kAdvance, kFarAdvance, kScience, kChooseTech, kChooseEnemyTech, kStealTech:
           if lix = adMilitary then
             MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkText,
@@ -999 +1073 @@
             MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkImp,
               lix and cpIndex);
-        kGov:
+        kGovernment:
           MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkMisc,
             Integer(miscGovList));
-        kShipPart, kEShipPart:
+        kShipPart, kEnemyShipPart:
           ;
       end;
@@ -1033 +1107 @@
     then
     begin
-      Layer.Code[Layer.Lines] := Project;
-      Inc(Layer.Lines);
+      Layer.AddLine(Project);
     end;
   end;
 
-  procedure SortTechs;
-  var
-    I, J: Integer;
-  begin // sort by advancedness
-    for I := 0 to Layers[laImprovements].Lines - 2 do
-      if Layers[laImprovements].Code[I] < adMilitary then
-        for J := I + 1 to Layers[laImprovements].Lines - 1 do
-          if AdvValue[Layers[laImprovements].Code[I]] * nAdv + Layers[laImprovements].Code[I] < AdvValue[Layers[laImprovements].Code[J]] *
-            nAdv + Layers[laImprovements].Code[J] then
-          begin
-            Layers[laImprovements].SwapCode(I, J);
-          end;
-  end;
-
-  procedure SortCities;
-  var
-    I, J: Integer;
-  begin
-    for I := 0 to Layers[laImprovements].Lines - 2 do
-      for J := I + 1 to Layers[laImprovements].Lines - 1 do
-        if CityName(MyCity[Layers[laImprovements].Code[I]].ID) > CityName(MyCity[Layers[laImprovements].Code[J]].ID)
-        then
-          Layers[laImprovements].SwapCode(I, J);
-  end;
-
-  function ModelSortValue(const mi: TModelInfo;
+  function ModelSortValue(const ModelInfo: TModelInfo;
     MixPlayers: Boolean = False): Integer;
   begin
-    Result := (mi.Domain + 1) shl 28 - mi.mix;
+    Result := (ModelInfo.Domain + 1) shl 28 - ModelInfo.mix;
     if MixPlayers then
-      Dec(Result, ModelCode(mi) shl 16);
-  end;
-
-  procedure SortModels;
-  var
-    I, J, Swap: Integer;
-  begin // sort by code[2]
-    for I := 0 to Layers[laImprovements].Lines - 2 do
-      for J := I + 1 to Layers[laImprovements].Lines - 1 do
-        if Layers[laClasses].Code[I] > Layers[laClasses].Code[J] then
-        begin
-          Layers[laImprovements].SwapCode(I, J);
-          Layers[laWonders].SwapCode(I, J);
-          Layers[laClasses].SwapCode(I, J);
-        end;
+      Dec(Result, ModelCode(ModelInfo) shl 16);
   end;
 
@@ -1100 +1134 @@
   L: TLayerIndex;
   Loc1, I, J, p1, dx, dy, mix, emix, EnemyType, TestEnemyType: Integer;
-  mi: TModelInfo;
+  ModelInfo: TModelInfo;
   PPicture, PTestPicture: ^TModelPicture;
   ModelOk: array [0 .. 4095] of Boolean;
+  Model: Integer;
   Ok: Boolean;
 begin
   for L := Low(TLayerIndex) to High(TLayerIndex) do
   begin
-    Layers[L].Lines := 0;
+    Layers[L].Lines.Clear;
     Layers[L].FirstShrinkedLine := MaxInt;
   end;
@@ -1115 +1150 @@
       begin
         // improvements
-        Layers[laImprovements].AddCode(cpImp + imTrGoods);
+        Layers[laImprovements].AddLine(cpImp + imTrGoods);
         for I := nWonder to nImp - 1 do
           if Imp[I].Kind = ikCommon then
@@ -1125 +1160 @@
         for I := 0 to nCityType - 1 do
           if MyData.ImpOrder[I, 0] >= 0 then
-            Layers[laImprovements].AddCode(cpType + I);
+            Layers[laImprovements].AddLine(cpType + I);
 
         // wonders
@@ -1134 +1169 @@
         for I := 0 to MyRO.nModel - 1 do
         begin
-          { if MyModel[i].Kind=mkSlaves then
-            Ok:= MyRO.Wonder[woPyramids].EffectiveOwner=Me
+          { if MyModel[i].Kind = mkSlaves then
+            Ok := MyRO.Wonder[woPyramids].EffectiveOwner = Me
             else } if MyModel[I].Domain = dSea then
           begin
@@ -1158 +1193 @@
             if MyModel[I].Status and msObsolete = 0 then
             begin
-              Layers[laClasses].AddCode(I);
+              Layers[laClasses].AddLine(I);
             end;
             if MyModel[I].Status and msAllowConscripts <> 0 then
             begin
-              Layers[laClasses].AddCode(I + cpConscripts);
+              Layers[laClasses].AddLine(I + cpConscripts);
             end;
           end;
@@ -1181 +1216 @@
             ((MyData.FarTech = adNone) or (Required[I] > 0)) then
           begin
-            Layers[laImprovements].AddCode(I);
-          end;
-        SortTechs;
-        if Layers[laImprovements].Lines = 0 then // no more techs -- offer nexus
-          Layers[laImprovements].AddCode(adNexus);
+            Layers[laImprovements].AddLine(I);
+          end;
+        Layers[laImprovements].SortTechs;
+        if Layers[laImprovements].Lines.Count = 0 then // no more techs -- offer nexus
+          Layers[laImprovements].AddLine(adNexus);
         Ok := False;
         for I := 0 to nDomains - 1 do
@@ -1194 +1229 @@
             end;
         if Ok then { new unit class }
-          Layers[laImprovements].AddCode(adMilitary);
+          Layers[laImprovements].AddLine(adMilitary);
       end;
     kFarAdvance:
       begin
-        Layers[laImprovements].AddCode(adNone);
+        Layers[laImprovements].AddLine(adNone);
         for I := 0 to nAdv - 1 do
           if not (I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
@@ -1204 +1239 @@
             ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
           begin
-            Layers[laImprovements].AddCode(I);
-          end;
-        SortTechs;
+            Layers[laImprovements].AddLine(I);
+          end;
+        Layers[laImprovements].SortTechs;
       end;
     kChooseTech:
@@ -1214 +1249 @@
             (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] < tsSeen) then
           begin
-            Layers[laImprovements].AddCode(I);
-          end;
-        SortTechs;
-        // if Lines[0] > 1 then
-        begin
-          Layers[laImprovements].AddCode(adAll);
-        end;
-      end;
-    kChooseETech:
+            Layers[laImprovements].AddLine(I);
+          end;
+        Layers[laImprovements].SortTechs;
+        // if Layers[0].Lines.Count > 1 then
+        begin
+          Layers[laImprovements].AddLine(adAll);
+        end;
+      end;
+    kChooseEnemyTech:
       begin
         for I := 0 to nAdv - 1 do
@@ -1228 +1263 @@
             (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
           begin
-            Layers[laImprovements].AddCode(I);
-          end;
-        SortTechs;
-        // if Lines[0] > 1 then
-        begin
-          Layers[laImprovements].AddCode(adAll);
+            Layers[laImprovements].AddLine(I);
+          end;
+        Layers[laImprovements].SortTechs;
+        // if LAyers[0].Lines.Count > 1 then
+        begin
+          Layers[laImprovements].AddLine(adAll);
         end;
       end;
@@ -1241 +1276 @@
           if Server(sStealTech - sExecute, Me, I, nil^) >= rExecuted then
           begin
-            Layers[laImprovements].AddCode(I);
-          end;
-        SortTechs;
+            Layers[laImprovements].AddLine(I);
+          end;
+        Layers[laImprovements].SortTechs;
       end;
     kScience:
@@ -1277 +1312 @@
                 Ok := True;
           if Ok then
-            Layers[laImprovements].AddCode(I);
-        end;
-        SortTechs;
+            Layers[laImprovements].AddLine(I);
+        end;
+        Layers[laImprovements].SortTechs;
 
         Ok := MyRO.ResearchTech = adMilitary;
@@ -1290 +1325 @@
               end;
         if Ok then
-          Layers[laImprovements].AddCode(adMilitary);
+          Layers[laImprovements].AddLine(adMilitary);
       end;
     kCities { , kChooseCity } :
@@ -1298 +1333 @@
             if MyCity[I].Loc >= 0 then
             begin
-              Layers[laImprovements].AddCode(I);
+              Layers[laImprovements].AddLine(I);
             end;
-        SortCities;
+        Layers[laImprovements].SortCities;
         Layers[laImprovements].FirstShrinkedLine := 0;
       end;
@@ -1308 +1343 @@
           if (MyCity[I].Loc >= 0) and (MyCity[I].Flags and CityRepMask <> 0)
           then begin
-            Layers[laImprovements].AddCode(I);
-          end;
-        SortCities;
+            Layers[laImprovements].AddLine(I);
+          end;
+        Layers[laImprovements].SortCities;
         Layers[laImprovements].FirstShrinkedLine := 0;
       end;
-    { kChooseECity:
+    { kChooseEnemyCity:
       begin
       for I := 0 to MyRO.nEnemyCity - 1 do
@@ -1327 +1362 @@
         for mix := 0 to MyRO.nModel - 1 do
         begin
-          Layers[laImprovements].Code[mix] := mix;
-          MakeModelInfo(Me, mix, MyModel[mix], mi);
-          Layers[laClasses].Code[mix] := ModelSortValue(mi);
-        end;
-        Layers[laImprovements].Lines := MyRO.nModel;
-        SortModels;
+          MakeModelInfo(Me, mix, MyModel[mix], ModelInfo);
+          Layers[laImprovements].AddLine(mix, 0, ModelSortValue(ModelInfo));
+        end;
+        Layers[laImprovements].SortModels;
         Layers[laImprovements].FirstShrinkedLine := 0;
       end;
@@ -1339 +1372 @@
         for mix := 3 to MyRO.nModel - 1 do
         begin // check if opponent already has this model
-          MakeModelInfo(Me, mix, MyModel[mix], mi);
+          MakeModelInfo(Me, mix, MyModel[mix], ModelInfo);
           Ok := True;
           for emix := 0 to MyRO.nEnemyModel - 1 do
             if (MyRO.EnemyModel[emix].Owner = DipMem[Me].pContact) and
-              IsSameModel(MyRO.EnemyModel[emix], mi) then begin
+              IsSameModel(MyRO.EnemyModel[emix], ModelInfo) then begin
                 Ok := False;
                 Break;
@@ -1349 +1382 @@
           if Ok then
           begin
-            Layers[laImprovements].Code[Layers[laImprovements].Lines] := mix;
-            MakeModelInfo(Me, mix, MyModel[mix], mi);
-            Layers[laClasses].Code[Layers[laImprovements].Lines] := ModelSortValue(mi);
-            Inc(Layers[laImprovements].Lines);
-          end;
-        end;
-        SortModels;
-          Layers[laImprovements].AddCode(mixAll);
-          Layers[laImprovements].FirstShrinkedLine := 0;
-      end;
-    kChooseEModel:
+            MakeModelInfo(Me, mix, MyModel[mix], ModelInfo);
+            Layers[laImprovements].AddLine(mix, 0, ModelSortValue(ModelInfo));
+          end;
+        end;
+        Layers[laImprovements].SortModels;
+        Layers[laImprovements].AddLine(mixAll);
+        Layers[laImprovements].FirstShrinkedLine := 0;
+      end;
+    kChooseEnemyModel:
       begin
         if MyRO.TestFlags and tfUncover <> 0 then
@@ -1367 +1398 @@
         for mix := 0 to MyRO.nModel - 1 do
         begin // don't list models I already have
-          MakeModelInfo(Me, mix, MyModel[mix], mi);
+          MakeModelInfo(Me, mix, MyModel[mix], ModelInfo);
           for emix := 0 to MyRO.nEnemyModel - 1 do
             ModelOk[emix] := ModelOk[emix] and
-              not IsSameModel(MyRO.EnemyModel[emix], mi);
+              not IsSameModel(MyRO.EnemyModel[emix], ModelInfo);
         end;
         for emix := 0 to MyRO.nEnemyModel - 1 do
@@ -1378 +1409 @@
               [MyRO.EnemyModel[emix].mix].HGr) then
               InitEnemyModel(emix);
-            Layers[laImprovements].Code[Layers[laImprovements].Lines] := emix;
-            Layers[laClasses].Code[Layers[laImprovements].Lines] := ModelSortValue(MyRO.EnemyModel[emix]);
-            Inc(Layers[laImprovements].Lines);
-          end;
-        SortModels;
+            Layers[laImprovements].AddLine(emix, 0, ModelSortValue(MyRO.EnemyModel[emix]));
+          end;
+        Layers[laImprovements].SortModels;
         // if not IsMilReportNew(DipMem[me].pContact) or (Layers[laImprovements].Lines > 1) then
         begin
-          Layers[laImprovements].AddCode(mixAll);
+          Layers[laImprovements].AddLine(mixAll);
         end;
         Layers[laImprovements].FirstShrinkedLine := 0;
       end;
-    kEModels:
-      begin
-        for I := 0 to MyRO.EnemyReport[pView].nModelCounted - 1 do
-        begin
-          Layers[laWonders].Code[Layers[laImprovements].Lines] := MyRO.nEnemyModel - 1;
-          while (Layers[laWonders].Code[Layers[laImprovements].Lines] >= 0) and
-            not ((MyRO.EnemyModel[Layers[laWonders].Code[Layers[laImprovements].Lines]].Owner = pView) and
-            (MyRO.EnemyModel[Layers[laWonders].Code[Layers[laImprovements].Lines]].mix = I)) do
-            Dec(Layers[laWonders].Code[Layers[laImprovements].Lines]);
-          if not Assigned(Tribe[pView].ModelPicture[I].HGr) then
-            InitEnemyModel(Layers[laWonders].Code[Layers[laImprovements].Lines]);
-          Layers[laImprovements].Code[Layers[laImprovements].Lines] := I;
-          Layers[laClasses].Code[Layers[laImprovements].Lines] :=
-            ModelSortValue(MyRO.EnemyModel[Layers[laWonders].Code[Layers[laImprovements].Lines]]);
-          Inc(Layers[laImprovements].Lines);
-        end;
-        SortModels;
+    kEnemyModels:
+      begin
+        for I := 0 to MyRO.EnemyReport[PlayerView].nModelCounted - 1 do
+        begin
+          Model := MyRO.nEnemyModel - 1;
+
+          while (Model >= 0) and
+            not ((MyRO.EnemyModel[Model].Owner = PlayerView) and
+            (MyRO.EnemyModel[Model].mix = I)) do
+            Dec(Model);
+
+          if not Assigned(Tribe[PlayerView].ModelPicture[I].HGr) then
+            InitEnemyModel(Model);
+
+          Layers[laImprovements].AddLine(I, Model, ModelSortValue(MyRO.EnemyModel[Model]));
+        end;
+        Layers[laImprovements].SortModels;
         Layers[laImprovements].FirstShrinkedLine := 0;
       end;
-    kAllEModels:
+    kAllEnemyModels:
       begin
         if (MyRO.TestFlags and tfUncover <> 0) or (G.Difficulty[Me] = 0) then
@@ -1423 +1452 @@
             Ok := True;
             if MainScreen.mNames.Checked then
-              for J := 0 to Layers[laImprovements].Lines - 1 do
+              for J := 0 to Layers[laImprovements].Lines.Count - 1 do
               begin
-                PTestPicture := @Tribe[MyRO.EnemyModel[Layers[laImprovements].Code[J]].Owner]
-                  .ModelPicture[MyRO.EnemyModel[Layers[laImprovements].Code[J]].mix];
+                Model := Layers[laImprovements].Lines[J].Code;
+                PTestPicture := @Tribe[MyRO.EnemyModel[Model].Owner]
+                  .ModelPicture[MyRO.EnemyModel[Model].mix];
                 if (PPicture.HGr = PTestPicture.HGr) and
                   (PPicture.pix = PTestPicture.pix) and
                   (ModelHash(MyRO.EnemyModel[emix])
-                  = ModelHash(MyRO.EnemyModel[Layers[laImprovements].Code[J]])) then
+                  = ModelHash(MyRO.EnemyModel[Model])) then
                 begin
-                  Layers[laWonders].Code[J] := 1;
+                  Layers[laImprovements].Lines[J].Model := 1;
                   Ok := False;
                   Break;
                 end;
               end;
-            if Ok then
-            begin
-              Layers[laImprovements].Code[Layers[laImprovements].Lines] := emix;
-              Layers[laWonders].Code[Layers[laImprovements].Lines] := 0;
-              Layers[laClasses].Code[Layers[laImprovements].Lines] := ModelSortValue(MyRO.EnemyModel[emix], True);
-              Inc(Layers[laImprovements].Lines);
+            if Ok then begin
+              Layers[laImprovements].AddLine(emix, 0, ModelSortValue(MyRO.EnemyModel[emix], True));
             end;
           end;
-        SortModels;
+        Layers[laImprovements].SortModels;
         Layers[laImprovements].FirstShrinkedLine := 0;
       end;
@@ -1451 +1477 @@
       for I := 0 to TribeNames.Count - 1 do
       begin
-        Layers[laImprovements].AddCode(I);
+        Layers[laImprovements].AddLine(I);
       end;
     (* kDeliver:
-      if MyRO.Treaty[DipMem[Me].pContact]<trAlliance then
+      if MyRO.Treaty[DipMem[Me].pContact] < trAlliance then
       begin // suggest next treaty level
-      Code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]+1;
-      Inc(Lines[0]);
-      end;
-      if MyRO.Treaty[DipMem[Me].pContact]=trNone then
+        Layers[laImprovements].AddLine(opTreaty + MyRO.Treaty[DipMem[Me].pContact] + 1);
+      end;
+      if MyRO.Treaty[DipMem[Me].pContact] = trNone then
       begin // suggest peace
-      Code[0,Lines[0]]:=opTreaty+trPeace;
-      Inc(Lines[0]);
-      end;
-      if MyRO.Treaty[DipMem[Me].pContact]>trNone then
+        Layers[laImprovements].AddLine(opTreaty + trPeace);
+      end;
+      if MyRO.Treaty[DipMem[Me].pContact] > trNone then
       begin // suggest next treaty level
-      Code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
-      Inc(Lines[0]);
+        Layers[laImprovements].AddLine(opTreaty + MyRO.Treaty[DipMem[Me].pContact] - 1);
       end; *)
     kShipPart:
       begin
-        Layers[laImprovements].Lines := 0;
+        Layers[laImprovements].Lines.Clear;
         for I := 0 to nShipPart - 1 do
           if MyRO.Ship[Me].Parts[I] > 0 then
           begin
-            Layers[laImprovements].AddCode(I);
-          end;
-      end;
-    kEShipPart:
-      begin
-        Layers[laImprovements].Lines := 0;
+            Layers[laImprovements].AddLine(I);
+          end;
+      end;
+    kEnemyShipPart:
+      begin
+        Layers[laImprovements].Lines.Clear;
         for I := 0 to nShipPart - 1 do
           if MyRO.Ship[DipMem[Me].pContact].Parts[I] > 0 then
           begin
-            Layers[laImprovements].AddCode(I);
-          end;
-      end;
-    kGov:
+            Layers[laImprovements].AddLine(I);
+          end;
+      end;
+    kGovernment:
       for I := 1 to nGov - 1 do
         if (GovPreq[I] <> preNA) and
@@ -1493 +1516 @@
         then
         begin
-          Layers[laImprovements].AddCode(I);
+          Layers[laImprovements].AddLine(I);
         end;
     kMission:
       for I := 0 to nSpyMission - 1 do
       begin
-        Layers[laImprovements].AddCode(I);
+        Layers[laImprovements].AddLine(I);
       end;
   end;
@@ -1504 +1527 @@
   // Test if choice fitting to one screen
   if Kind = kProject then
-    if Layers[laImprovements].Lines + Layers[laWonders].Lines + Layers[laClasses].Lines <= MaxLines then
+    if Layers[laImprovements].Lines.Count + Layers[laWonders].Lines.Count + Layers[laClasses].Lines.Count <= MaxLines then
     begin
       // Add wonders to first page
-      for I := 0 to Layers[laWonders].Lines - 1 do
-        Layers[laImprovements].AddCode(Layers[laWonders].Code[I]);
-      Layers[laWonders].Lines := 0;
-
-      Layers[laImprovements].FirstShrinkedLine := Layers[laImprovements].Lines;
+      for I := 0 to Layers[laWonders].Lines.Count - 1 do
+        Layers[laImprovements].AddLine(Layers[laWonders].Lines[I].Code, Layers[laWonders].Lines[I].Model, Layers[laWonders].Lines[I].ModelSortValue);
+      Layers[laWonders].Lines.Clear;
+
+      Layers[laImprovements].FirstShrinkedLine := Layers[laImprovements].Lines.Count;
 
       // Add models to first page
-      for I := 0 to Layers[laClasses].Lines - 1 do
-        Layers[laImprovements].AddCode(Layers[laClasses].Code[I]);
-      Layers[laClasses].Lines := 0;
+      for I := 0 to Layers[laClasses].Lines.Count - 1 do
+        Layers[laImprovements].AddLine(Layers[laClasses].Lines[I].Code, Layers[laClasses].Lines[I].Model, Layers[laClasses].Lines[I].ModelSortValue);
+      Layers[laClasses].Lines.Clear;
     end;
 end;
@@ -1524 +1547 @@
   Kind := TestKind;
   InitLines;
-  if Layers[laImprovements].Lines = 0 then
+  if Layers[laImprovements].Lines.Count = 0 then
     Result := -2
-  else if Layers[laImprovements].Lines > 1 then
+  else if Layers[laImprovements].Lines.Count > 1 then
     Result := -1
   else
-    Result := Layers[laImprovements].Code[0];
+    Result := Layers[laImprovements].Lines[0].Code;
 end;
 
@@ -1556 +1579 @@
   MultiPage := False;
   for L := laWonders to High(TLayerIndex) do
-    if Layers[L].Lines > 0 then begin
+    if Layers[L].Lines.Count > 0 then begin
       MultiPage := True;
       Break;
@@ -1565 +1588 @@
     (Kind in [kProject, kAdvance, kFarAdvance]);
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) or (Kind = kModels) or
-    (Kind = kEModels) then begin
+    (Kind = kEnemyModels) then begin
     ScrollBar.SetBorderSpacing(56, 10, 10);
     TitleHeight := WideFrame + 20;
@@ -1573 +1596 @@
   end;
 
-  DispLines := Layers[laImprovements].Lines;
+  DispLines := Layers[laImprovements].Lines.Count;
   for L := Low(TLayerIndex) to High(TLayerIndex) do
-    if Layers[L].Lines > DispLines then
-      DispLines := Layers[L].Lines;
+    if Layers[L].Lines.Count > DispLines then
+      DispLines := Layers[L].Lines.Count;
   if WideBottom then
   begin
@@ -1595 +1618 @@
   TechNameSpace := 224;
   case Kind of
-    kGov:
+    kGovernment:
       InnerWidth := 272;
     kCities, kCityEvents:
       InnerWidth := 640 - 18;
     kTribe:
-      if Layers[laImprovements].Lines > MaxLines then
+      if Layers[laImprovements].Lines.Count > MaxLines then
         InnerWidth := 280 + GetSystemMetrics(SM_CXVSCROLL)
       else
@@ -1617 +1640 @@
       InnerWidth := 104 - 33 + 15 + 8 + TechNameSpace + 24 +
         GetSystemMetrics(SM_CXVSCROLL);
-    kChooseTech, kChooseETech, kStealTech:
+    kChooseTech, kChooseEnemyTech, kStealTech:
       InnerWidth := 104 - 33 + 15 + 8 + TechNameSpace +
         GetSystemMetrics(SM_CXVSCROLL);
@@ -1644 +1667 @@
   end;
 
-  LayerImprovementsButton.Visible := MultiPage and (Layers[laImprovements].Lines > 0);
-  LayerWondersButton.Visible := MultiPage and (Layers[laWonders].Lines > 0);
-  LayerClassesButton.Visible := MultiPage and (Layers[laClasses].Lines > 0);
+  LayerImprovementsButton.Visible := MultiPage and (Layers[laImprovements].Lines.Count > 0);
+  LayerWondersButton.Visible := MultiPage and (Layers[laWonders].Lines.Count > 0);
+  LayerClassesButton.Visible := MultiPage and (Layers[laClasses].Lines.Count > 0);
 
   if Kind = kProject then
@@ -1664 +1687 @@
   Selected := -2;
   ScienceNation := -1;
-  ScrollBar.Init(Layer.Lines - 1, DispLines);
+  ScrollBar.Init(Layer.Lines.Count - 1, DispLines);
 
   OffscreenPaint;
@@ -1677 +1700 @@
     not ((Kind = kCities) and (ListKind = kCityEvents)) and
     not ((Kind = kCityEvents) and (ListKind = kCities)) and
-    not ((Kind = kModels) and (ListKind = kEModels)) and
-    not ((Kind = kEModels) and (ListKind = kModels));
+    not ((Kind = kModels) and (ListKind = kEnemyModels)) and
+    not ((Kind = kEnemyModels) and (ListKind = kModels));
 
   Kind := ListKind;
@@ -1689 +1712 @@
     kFarAdvance:
       Caption := Phrases.Lookup('TITLE_FARTECH');
-    kModels, kEModels:
+    kModels, kEnemyModels:
       Caption := Phrases.Lookup('FRMILREP');
-    kAllEModels:
+    kAllEnemyModels:
       Caption := Phrases.Lookup('TITLE_EMODELS');
     kTribe:
@@ -1697 +1720 @@
     kScience:
       Caption := Phrases.Lookup('TITLE_SCIENCE');
-    kShipPart, kEShipPart:
+    kShipPart, kEnemyShipPart:
       Caption := Phrases.Lookup('TITLE_CHOOSESHIPPART');
-    kChooseTech, kChooseETech:
+    kChooseTech, kChooseEnemyTech:
       Caption := Phrases.Lookup('TITLE_CHOOSETECH');
-    kChooseModel, kChooseEModel:
+    kChooseModel, kChooseEnemyModel:
       Caption := Phrases.Lookup('TITLE_CHOOSEMODEL');
     kStealTech:
       Caption := Phrases.Lookup('TITLE_CHOOSETECH');
-    kGov:
+    kGovernment:
       Caption := Phrases.Lookup('TITLE_GOV');
     kMission:
@@ -1750 +1773 @@
     end;
   ToggleBtn.Visible := (Kind = kCities) and not Supervising or (Kind = kAdvance)
-    and ShowFocus or (Kind = kModels) or (Kind = kEModels);
+    and ShowFocus or (Kind = kModels) or (Kind = kEnemyModels);
   CloseBtn.Visible := not (Kind in MustChooseKind);
 
@@ -1762 +1785 @@
 end;
 
-procedure TListDlg.ShowNewContent_MilReport(NewMode: TWindowMode; P: Integer);
-begin
-  pView := P;
-  if P = Me then
+procedure TListDlg.ShowNewContent_MilReport(NewMode: TWindowMode; Player: Integer);
+begin
+  PlayerView := Player;
+  if Player = Me then
     ShowNewContent(NewMode, kModels)
   else
-    ShowNewContent(NewMode, kEModels);
+    ShowNewContent(NewMode, kEnemyModels);
 end;
 
@@ -1777 +1800 @@
   else
   begin
-    Kind := kEModels;
-    pView := TComponent(Sender).Tag;
+    Kind := kEnemyModels;
+    PlayerView := TComponent(Sender).Tag;
   end;
   InitLines;
   Selected := -2;
-  ScrollBar.Init(Layer.Lines - 1, DispLines);
+  ScrollBar.Init(Layer.Lines.Count - 1, DispLines);
   OffscreenPaint;
   Invalidate;
@@ -1795 +1818 @@
 
   Selected := -2;
-  ScrollBar.Init(Layer.Lines - 1, DispLines);
+  ScrollBar.Init(Layer.Lines.Count - 1, DispLines);
   SmartUpdateContent;
 end;
@@ -1820 +1843 @@
         Invalidate;
       end;
-    kModels, kEModels:
+    kModels, kEnemyModels:
       begin
         EmptyMenu(Popup.Items);
@@ -1843 +1866 @@
             M.Tag := p1;
             M.OnClick := PlayerClick;
-            if (Kind = kEModels) and (p1 = pView) then
+            if (Kind = kEnemyModels) and (p1 = PlayerView) then
               M.Checked := True;
             Popup.Items.Add(M);
@@ -1867 +1890 @@
 begin
   if Index < 0 then Index := 0;
-  if Index > Layer.Lines - 1 then Index := Layer.Lines - 1;
+  if Index > Layer.Lines.Count - 1 then Index := Layer.Lines.Count - 1;
 
   NewSelected := Index - ScrollBar.Position;
   NewScrollBarPos := ScrollBar.Position;
 
-  Over := NewSelected - Min(DispLines, Layer.Lines - NewScrollBarPos);
+  Over := NewSelected - Min(DispLines, Layer.Lines.Count - NewScrollBarPos);
   if Over > 0 then begin
     Inc(NewScrollBarPos, Over);
@@ -1885 +1908 @@
 
   if (NewSelected <> Selected) or (NewScrollBarPos <> ScrollBar.Position) then begin
-    if Selected >= 0 then Line(Canvas, Selected, False, False);
+    if Selected >= 0 then PaintLine(Canvas, Selected, False, False);
 
     ScrollBar.Position := NewScrollBarPos;
     Selected := NewSelected;
 
-    Line(Canvas, Selected, False, True);
+    PaintLine(Canvas, Selected, False, True);
   end;
 end;
@@ -1904 +1927 @@
       if Layer = Layers[laImprovements] then Layer := Layers[laClasses]
       else if Layer = Layers[laClasses] then Layer := Layers[laWonders];
-      if Layer.Lines = 0 then Layer := Layers[laWonders];
+      if Layer.Lines.Count = 0 then Layer := Layers[laWonders];
       LayerImprovementsButton.Down := Layer = Layers[laImprovements];
       LayerWondersButton.Down := Layer = Layers[laWonders];
       LayerClassesButton.Down := Layer = Layers[laClasses];
-      ScrollBar.Init(Layer.Lines - 1, DispLines);
+      ScrollBar.Init(Layer.Lines.Count - 1, DispLines);
       SetSelectionIndex(LastSelectionIndex);
       SmartUpdateContent;
@@ -1918 +1941 @@
       if Layer = Layers[laWonders] then Layer := Layers[laClasses]
       else if Layer = Layers[laClasses] then Layer := Layers[laImprovements];
-      if Layer.Lines = 0 then Layer := Layers[laImprovements];
+      if Layer.Lines.Count = 0 then Layer := Layers[laImprovements];
       LayerImprovementsButton.Down := Layer = Layers[laImprovements];
       LayerWondersButton.Down := Layer = Layers[laWonders];
       LayerClassesButton.Down := Layer = Layers[laClasses];
-      ScrollBar.Init(Layer.Lines - 1, DispLines);
+      ScrollBar.Init(Layer.Lines.Count - 1, DispLines);
       SetSelectionIndex(LastSelectionIndex);
       SmartUpdateContent;
@@ -1937 +1960 @@
   end else
   if (Key = VK_END) or (Key = VK_NUMPAD1) then begin
-    SetSelectionIndex(Layer.Lines);
+    SetSelectionIndex(Layer.Lines.Count);
   end else
   if (Key = VK_PRIOR) or (Key = VK_NUMPAD9) then begin
@@ -1948 +1971 @@
     PaintBox1MouseDown(Self, TMouseButton.mbLeft, [ssLeft], 0, 0);
   end else
-  if (Key = VK_F2) and (Kind in [kModels, kEModels]) then // my key
+  if (Key = VK_F2) and (Kind in [kModels, kEnemyModels]) then // my key
     // !!! toggle
   else if (Key = VK_F3) and (Kind in [kCities, kCityEvents]) then // my key

trunk/LocalPlayer/Term.pas

@@ -2300 +2300 @@
     if MyRO.Happened and phChangeGov <> 0 then
     begin
-      ModalSelectDlg.ShowNewContent(wmModal, kGov);
+      ModalSelectDlg.ShowNewContent(wmModal, kGovernment);
       Play('NEWGOV');
       Server(sSetGovernment, Me, ModalSelectDlg.Result, nil^);
@@ -3806 +3806 @@
 begin
   if MyRO.nEnemyModel > 0 then
-    ListDlg.ShowNewContent(wmPersistent, kAllEModels);
+    ListDlg.ShowNewContent(wmPersistent, kAllEnemyModels);
 end;
 
@@ -4042 +4042 @@
       if MyRO.Happened and phChangeGov <> 0 then
       begin
-        ModalSelectDlg.ShowNewContent(wmModal, kGov);
+        ModalSelectDlg.ShowNewContent(wmModal, kGovernment);
         if ModalSelectDlg.Result >= 0 then
         begin