Changeset 531 for trunk

Timestamp:

Mar 27, 2024, 12:31:14 PM (8 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• AI/StdAI/AI.pas (modified) (6 diffs)
• AI/StdAI/Barbarina.pas (modified) (16 diffs)
• AI/StdAI/CustomAI.pas (modified) (1 diff)
• AI/StdAI/CustomAI_Reload.pas (modified) (1 diff)
• AI/StdAI/ToolAI.pas (modified) (7 diffs)
• Database.pas (modified) (11 diffs)
• GameServer.pas (modified) (6 diffs)
• LocalPlayer/CityType.pas (modified) (8 diffs)
• LocalPlayer/ClientTools.pas (modified) (2 diffs)
• LocalPlayer/Draft.pas (modified) (3 diffs)
• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (2 diffs)
• LocalPlayer/NatStat.pas (modified) (3 diffs)
• LocalPlayer/Nego.pas (modified) (3 diffs)
• LocalPlayer/Rates.pas (modified) (3 diffs)
• LocalPlayer/Select.pas (modified) (9 diffs)
• LocalPlayer/Term.pas (modified) (20 diffs)
• LocalPlayer/Tribes.pas (modified) (3 diffs)
• LocalPlayer/UnitStat.pas (modified) (4 diffs)
• Log.pas (modified) (1 diff)
• NoTerm.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonA.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonB.pas (modified) (2 diffs)
• Packages/CevoComponents/ButtonBase.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonC.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonN.pas (modified) (2 diffs)
• Packages/CevoComponents/DrawDlg.pas (modified) (2 diffs)
• Packages/CevoComponents/EOTButton.pas (modified) (3 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (1 diff)
• Packages/CevoComponents/Sound.pas (modified) (1 diff)
• Packages/Common/Common.pas (modified) (2 diffs)
• Start.pas (modified) (4 diffs)

trunk/AI/StdAI/AI.pas

@@ -93 +93 @@
   TPersistentData = record
     LastResearchTech, BehaviorFlags, TheologyPartner: Integer;
-    RejectTurn: array[Suggestion, 0..15] of smallint;
+    RejectTurn: array[Suggestion, 0..15] of SmallInt;
     RequestedTechs: array[0..nRequestedTechs - 1] of Integer;
     // ad + p shl 8 + Turn shl 16
@@ -196 +196 @@
     else
       BehaviorFlags := bMale;
-    DebugMessage(1, 'Gender:=' + char(48 + BehaviorFlags and bGender));
+    DebugMessage(1, 'Gender:=' + Char(48 + BehaviorFlags and bGender));
     TheologyPartner := -1;
     FillChar(RejectTurn, SizeOf(RejectTurn), $FF);
-    Fillchar(RequestedTechs, SizeOf(RequestedTechs), $FF);
+    FillChar(RequestedTechs, SizeOf(RequestedTechs), $FF);
   end;
 end;
@@ -324 +324 @@
   mi: TModelInfo;
   Entry: array[0..nAdv - 1] of Boolean;
-  ok: Boolean;
+  Ok: Boolean;
 
   function MarkEntry(ad: Integer): Boolean;
@@ -540 +540 @@
       ((EarliestNeeded < 0) or (Advancedness[ad] < Advancedness[EarliestNeeded])) then
     begin
-      ok := False;
+      Ok := False;
       for iad := 0 to nResearchOrder - 1 do
         if ResearchOrder[Data.BehaviorFlags and bGender, iad] = ad then
         begin
-          ok := True;
+          Ok := True;
           Break;
         end;
-      if not ok then
+      if not Ok then
       begin
         EarliestNeeded := ad;
@@ -1406 +1406 @@
   begin
     Data.BehaviorFlags := Data.BehaviorFlags and not bGender or NewGender;
-    DebugMessage(1, 'Gender:=' + char(48 + NewGender));
+    DebugMessage(1, 'Gender:=' + Char(48 + NewGender));
   end;
 end;
@@ -2427 +2427 @@
             Total := Total + CityResult[cix];
       if Total = 0 then
-        continue; // district does not exist
+        Continue; // district does not exist
 
       Share := 0;

trunk/AI/StdAI/Barbarina.pas

@@ -34 +34 @@
   TBarbarina = class(TToolAI)
     constructor Create(Nation: Integer); override;
-
   protected
     ColonyShipPlan: TColonyShipPlan;
@@ -47 +46 @@
     procedure Barbarina_DoNegotiation;
     procedure MakeColonyShipPlan;
-
   private
     TurnOfMapAnalysis, Neighbours: Integer;
@@ -173 +171 @@
   Moved: array[0..numax - 1] of Boolean;
   UnitPresence: array[0..lxmax * lymax - 1] of Byte;
-  euixMap: array[0..lxmax * lymax - 1] of smallint;
-  uixAttack: array[0..neumax - 1] of smallint;
+  euixMap: array[0..lxmax * lymax - 1] of SmallInt;
+  uixAttack: array[0..neumax - 1] of SmallInt;
   AttackScore: array[0..neumax - 1] of Integer;
 
@@ -1599 +1597 @@
           end;
           if (City_CurrentImprovementProject(cix) = imCourt) and
-            (Built[imTownHall] > 0) and (prod >= imp[imCourt].cost *
+            (Built[imTownHall] > 0) and (Prod >= imp[imCourt].Cost *
             BuildCostMod[G.Difficulty[Me]] div 12 -
-            (imp[imTownHall].cost * BuildCostMod[G.Difficulty[Me]] div 12) *
+            (Imp[imTownHall].Cost * BuildCostMod[G.Difficulty[Me]] div 12) *
             2 div 3) then
             City_RebuildImprovement(cix, imTownHall)
@@ -1622 +1620 @@
 var
   nPreq, rmix, rmixChosen, I, MaxWeight, MaxDefense, ChosenPreq: Integer;
-  NeedSeaUnits, ready: Boolean;
+  NeedSeaUnits, Ready: Boolean;
   ModelExists: set of 0..nModelCategory - 1;
-  known: array[0..nAdv - 1] of Integer;
+  Known: array[0..nAdv - 1] of Integer;
 
   procedure ChoosePreq(ad: Integer);
@@ -1632 +1630 @@
   begin
     Assert(RO.Tech[ad] < tsApplicable);
-    if known[ad] = 0 then
+    if Known[ad] = 0 then
     begin
-      known[ad] := 1;
+      Known[ad] := 1;
       PreqOk := True;
       if not (ad in [adScience, adMassProduction]) and (RO.Tech[ad] < tsSeen) then
@@ -1695 +1693 @@
         if IsResearched(adSteel) then
           Inc(MaxDefense);
-        ready := (MaxWeight >= Weight) and (MaxDefense >= Cap[mcDefense]);
-        if ready then
+        Ready := (MaxWeight >= Weight) and (MaxDefense >= Cap[mcDefense]);
+        if Ready then
           for I := 0 to nFeature - 1 do
             if (Cap[I] > 0) and (Feature[I].Preq <> preNone) and
               ((Feature[I].Preq < 0) or not IsResearched(Feature[I].Preq)) then
-              ready := False;
-        if ready then
+              Ready := False;
+        if Ready then
         begin
           for I := 0 to nUpgrade - 1 do
             if (Upgrades and (1 shl I) <> 0) and not
               IsResearched(Upgrade[Domain, I].Preq) then
-              ready := False;
-        end;
-        if ready then
+              Ready := False;
+        end;
+        if Ready then
         begin
           Include(ModelExists, Category);
@@ -1736 +1734 @@
   I := 0;
   while (I < nResearchOrder) and (not NeedSeaUnits and (ResearchOrder[I] < 0) or
-      IsResearched(Abs(ResearchOrder[I]))) do
-    Inc(I);
+    IsResearched(Abs(ResearchOrder[I]))) do
+      Inc(I);
   if I >= nResearchOrder then // list done, continue with future tech
   begin
@@ -1747 +1745 @@
   else
   begin
-    FillChar(known, SizeOf(known), 0);
+    FillChar(Known, SizeOf(Known), 0);
     nPreq := 0;
     ChosenPreq := -1;
@@ -1835 +1833 @@
                     (MyModel[mix].Domain <> dSea)) then
                   begin
-                    DebugMessage(1, 'Declare war on P' + char(48 + Nation));
+                    DebugMessage(1, 'Declare war on P' + Char(48 + Nation));
                     NegoCause := CancelTreaty;
                     Result := True;
@@ -1858 +1856 @@
 procedure TBarbarina.MakeColonyShipPlan;
 var
-  I, V21, V21C, CityLoc, Loc1, part, cix, BestValue, TestValue, FoodCount,
+  I, V21, V21C, CityLoc, Loc1, Part, cix, BestValue, TestValue, FoodCount,
   ProdCount, ProdExtra, Score, BestScore: Integer;
   Tile: Cardinal;
-  ok, check: Boolean;
+  Ok, Check: Boolean;
   Radius, RadiusC: TVicinity21Loc;
 begin
-  for part := 0 to nShipPart - 1 do
+  for Part := 0 to nShipPart - 1 do
   begin
-    ColonyShipPlan[part].cixProducing := -1;
-    ColonyShipPlan[part].nLocResource := 0;
-    ColonyShipPlan[part].nLocFoundCity := 0;
+    ColonyShipPlan[Part].cixProducing := -1;
+    ColonyShipPlan[Part].nLocResource := 0;
+    ColonyShipPlan[Part].nLocFoundCity := 0;
   end;
   if RO.Tech[adMassProduction] >= tsApplicable then // able to recognize ressources yet
   begin
-    // check already existing cities
+    // Check already existing cities
     for cix := 0 to RO.nCity - 1 do
       with MyCity[cix] do
@@ -1886 +1884 @@
               if Tile and fModern <> 0 then
               begin
-                part := (Tile and fModern) shr 25 - 1;
-                if RO.Ship[Me].Parts[part] < ShipNeed[part] then
+                Part := (Tile and fModern) shr 25 - 1;
+                if RO.Ship[Me].Parts[Part] < ShipNeed[Part] then
                   // not enough of this kind already
                 begin
-                  ok := True;
-                  if ColonyShipPlan[part].cixProducing >= 0 then
+                  Ok := True;
+                  if ColonyShipPlan[Part].cixProducing >= 0 then
                   begin // another city is already assigned to this ship part, choose one of the two
                     TestValue := (ID and $FFF) shl 4 + ((ID shr 12) + 15 - Me) and $F;
                     BestValue :=
-                      (MyCity[ColonyShipPlan[part].cixProducing].ID and $FFF) shl
-                      4 + ((MyCity[ColonyShipPlan[part].cixProducing].ID shr 12) +
+                      (MyCity[ColonyShipPlan[Part].cixProducing].ID and $FFF) shl
+                      4 + ((MyCity[ColonyShipPlan[Part].cixProducing].ID shr 12) +
                       15 - Me) and $F;
                     if TestValue <= BestValue then
-                      ok := False;
+                      Ok := False;
                   end;
-                  if ok then
+                  if Ok then
                     ColonyShipPlan[part].cixProducing := cix;
                 end;
@@ -1910 +1908 @@
 
     // for parts without existing city, look for location of city to found
-    check := False;
-    for part := 0 to nShipPart - 1 do
-      if (RO.Ship[Me].Parts[part] < ShipNeed[part]) // not enough of this kind already
-        and (ColonyShipPlan[part].cixProducing < 0) then // no city to produce
-        check := True;
-    if check then
+    Check := False;
+    for Part := 0 to nShipPart - 1 do
+      if (RO.Ship[Me].Parts[Part] < ShipNeed[Part]) // not enough of this kind already
+        and (ColonyShipPlan[Part].cixProducing < 0) then // no city to produce
+        Check := True;
+    if Check then
     begin
       for Loc1 := 0 to MapSize - 1 do
@@ -1922 +1920 @@
         if Tile and fModern <> 0 then
         begin
-          part := (Tile and fModern) shr 25 - 1;
-          if ColonyShipPlan[part].nLocResource < maxModern then
-          begin
-            ColonyShipPlan[part].LocResource[ColonyShipPlan[part].nLocResource] := Loc1;
-            Inc(ColonyShipPlan[part].nLocResource);
-          end;
-        end;
-      end;
-      for part := 0 to nShipPart - 1 do
-        if (RO.Ship[Me].Parts[part] < ShipNeed[part]) // not enough of this kind already
-          and (ColonyShipPlan[part].cixProducing < 0) // no city to produce
-          and (ColonyShipPlan[part].nLocResource > 0) then // resource is known
-        begin
-          for I := 0 to ColonyShipPlan[part].nLocResource - 1 do
+          Part := (Tile and fModern) shr 25 - 1;
+          if ColonyShipPlan[Part].nLocResource < maxModern then
+          begin
+            ColonyShipPlan[Part].LocResource[ColonyShipPlan[Part].nLocResource] := Loc1;
+            Inc(ColonyShipPlan[Part].nLocResource);
+          end;
+        end;
+      end;
+      for Part := 0 to nShipPart - 1 do
+        if (RO.Ship[Me].Parts[Part] < ShipNeed[Part]) // not enough of this kind already
+          and (ColonyShipPlan[Part].cixProducing < 0) // no city to produce
+          and (ColonyShipPlan[Part].nLocResource > 0) then // resource is known
+        begin
+          for I := 0 to ColonyShipPlan[Part].nLocResource - 1 do
           begin
             BestScore := 0;
-            V21_to_Loc(ColonyShipPlan[part].LocResource[I], Radius);
+            V21_to_Loc(ColonyShipPlan[Part].LocResource[I], Radius);
             for V21 := 1 to 26 do
-            begin // check all potential cities in range
+            begin // Check all potential cities in range
               CityLoc := Radius[V21];
               if CityLoc >= 0 then
@@ -1990 +1988 @@
                   begin
                     BestScore := Score;
-                    ColonyShipPlan[part].LocFoundCity[
-                      ColonyShipPlan[part].nLocFoundCity] :=
+                    ColonyShipPlan[Part].LocFoundCity[
+                      ColonyShipPlan[Part].nLocFoundCity] :=
                       CityLoc;
                   end;
@@ -1998 +1996 @@
             end;
             if BestScore > 0 then
-              Inc(ColonyShipPlan[part].nLocFoundCity);
+              Inc(ColonyShipPlan[Part].nLocFoundCity);
           end;
         end;

trunk/AI/StdAI/CustomAI.pas

@@ -682 +682 @@
 function TCustomAI.DebugMessage(Level: Integer; Text: string): Boolean;
 begin
-  Text := Copy('P' + char(48 + Me) + ' ' + Text, 1, 254);
+  Text := Copy('P' + Char(48 + Me) + ' ' + Text, 1, 254);
   Server(sMessage, Me, Level, PChar(Text)^);
 

trunk/AI/StdAI/CustomAI_Reload.pas

@@ -639 +639 @@
 function TCustomAI.DebugMessage(Level: Integer; Text: string): Boolean;
 begin
-  Text := Copy('P' + char(48 + Me) + ' ' + Text, 1, 254);
+  Text := Copy('P' + Char(48 + Me) + ' ' + Text, 1, 254);
   Server(sMessage, Me, Level, PChar(Text)^);
 

trunk/AI/StdAI/ToolAI.pas

@@ -355 +355 @@
   UnitsToAssign: Boolean;
   Adjacent: TVicinity8Loc;
-  SettlerOfJobLoc, DistToLoc: array[0..lxmax * lymax - 1] of smallint;
+  SettlerOfJobLoc, DistToLoc: array[0..lxmax * lymax - 1] of SmallInt;
   // DistToLoc is only defined where SettlerOfJobLoc>=0
   TileChecked: array[0..lxmax * lymax - 1] of Boolean;
@@ -471 +471 @@
   I, J, Loc, Loc1, V8, Count, Kind, MostIndex: Integer;
   Adjacent: TVicinity8Loc;
-  IndexOfID: array[0..lxmax * lymax - 1] of smallint;
-  IDOfIndex: array[0..lxmax * lymax div 2 - 1] of smallint;
+  IndexOfID: array[0..lxmax * lymax - 1] of SmallInt;
+  IDOfIndex: array[0..lxmax * lymax div 2 - 1] of SmallInt;
 begin
   FillChar(District, MapSize * 4, $FF);
@@ -1107 +1107 @@
   nSelectedLoad, F, OriginContinent, A, B: Integer;
   CompleteFlag, NotReachedFlag, ContinueUnit: Cardinal;
-  IsComplete, ok, IsFirstLoc: Boolean;
+  IsComplete, Ok, IsFirstLoc: Boolean;
   StartLocPtr, ArrivedEnd: pinteger;
   Adjacent: TVicinity8Loc;
@@ -1113 +1113 @@
   tuixSelectedLoad: array[0..15] of Integer;
   Arrived: array[0..lxmax * lymax] of Cardinal;
-  ResponsibleTransport: array[0..lxmax * lymax - 1] of smallint;
+  ResponsibleTransport: array[0..lxmax * lymax - 1] of SmallInt;
   TurnsBeforeLoad: array[0..lxmax * lymax - 1] of ShortInt;
   GroupComplete: array[0..lxmax * lymax - 1] of Boolean;
@@ -1191 +1191 @@
     FillChar(ResponsibleTransport, MapSize * 2, $FF); // -1
     FillChar(TurnsBeforeLoad, MapSize, $FF); // -1
-    ok := False;
+    Ok := False;
     for uix := 0 to RO.nUn - 1 do
       if TransportAvailable[uix] > 0 then
       begin
-        ok := True;
+        Ok := True;
         Pile.Put(MyUnit[uix].Loc, ($800 - MyUnit[uix].Movement) shl 12 + uix);
       end;
-    if not ok then // no transports
+    if not Ok then // no transports
     begin
       TransportPlan.LoadLoc := -1;
@@ -1392 +1392 @@
             begin
               Arrived[Loc0] := (Arrived[Loc0] or CompleteFlag) and not NotReachedFlag;
-              continue;
+              Continue;
             end;
             IsComplete := True;
@@ -1400 +1400 @@
               if Loc1 >= 0 then
               begin
-                ok := False;
+                Ok := False;
                 case CheckStep(MoveStyle, Time0, V8 and 1, ArriveTime,
                     RecoverTurns, Map[Loc0], Map[Loc1], False) of
-                  csOk: ok := True;
+                  csOk: Ok := True;
                   csForbiddenTile:
                     ;// !!! don't check moving there again
                   csCheckTerritory:
-                    ok := RO.Territory[Loc1] = RO.Territory[Loc0];
+                    Ok := RO.Territory[Loc1] = RO.Territory[Loc0];
                 end;
-                if ok and Pile.TestPut(Loc1, ArriveTime) then
+                if Ok and Pile.TestPut(Loc1, ArriveTime) then
                   if ArriveTime < $2000 then
                     Pile.Put(Loc1, ArriveTime)

trunk/Database.pas

@@ -559 +559 @@
 procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
 var
-  dx, dy, bit, y0, xComp, yComp, xComp0, xCompSwitch: Integer;
-  dst: ^Integer;
+  dx, dy, Bit, y0, xComp, yComp, xComp0, xCompSwitch: Integer;
+  Dst: ^Integer;
 begin
   y0 := Loc0 div lx;
@@ -571 +571 @@
   xCompSwitch := xCompSwitch xor xComp0;
   yComp := lx * (y0 - 3);
-  dst := @VicinityLoc;
-  bit := 1;
+  Dst := @VicinityLoc;
+  Bit := 1;
   for dy := 0 to 6 do
   begin
@@ -579 +579 @@
     for dx := 0 to 3 do
     begin
-      if bit and $67F7F76 <> 0 then
-        dst^ := xComp + yComp
+      if Bit and $67F7F76 <> 0 then
+        Dst^ := xComp + yComp
       else
-        dst^ := -1;
+        Dst^ := -1;
       Inc(xComp);
       if xComp >= lx then
         Dec(xComp, lx);
-      Inc(dst);
-      bit := bit shl 1;
+      Inc(Dst);
+      Bit := Bit shl 1;
     end;
     Inc(yComp, lx);
@@ -1317 +1317 @@
   Radius: TVicinity21Loc;
   Adjacent: TVicinity8Loc;
-  ok: Boolean;
+  Ok: Boolean;
 
 begin
@@ -1414 +1414 @@
     end;
 
-    ok := True;
+    Ok := True;
     for C := 1 to nsc do
       if nCityLoc[C] < sccount[C] * (8 - MinGood) div (7 - MinGood) then
-        ok := False;
-  until ok;
+        Ok := False;
+  until Ok;
 
   FineDistSQR := MapSize * LandMass * 9 div (nAlive * 100);
@@ -1478 +1478 @@
       end;
     end;
-    p1 := p1 + sccount[C]
+    p1 := p1 + sccount[C];
   end;
 
@@ -1603 +1603 @@
   I, p1, Loc1, nAlive, nStartLoc0, nPrefStartLoc0, imax: Integer;
   StartLoc0: array [0 .. lxmax * lymax - 1] of Integer;
-  ishuman: Boolean;
+  IsHuman: Boolean;
 begin
   nAlive := 0;
@@ -1636 +1636 @@
 
   StartLoc[0] := 0;
-  for ishuman := True downto False do
+  for IsHuman := True downto False do
     for p1 := 0 to nPl - 1 do
-      if (1 shl p1 and GAlive <> 0) and ((1 shl p1 and Human <> 0) = ishuman)
+      if (1 shl p1 and GAlive <> 0) and ((1 shl p1 and Human <> 0) = IsHuman)
       then
       begin
@@ -1790 +1790 @@
 
   TerritoryCount[nPl] := MapSize;
-  // fillchar(NewContact, sizeof(NewContact), false);
+  // FillChar(NewContact, SizeOf(NewContact), False);
 end;
 
@@ -3487 +3487 @@
   I: Integer;
   miSender, miTarget: TModelInfo;
-  ok: Boolean;
+  Ok: Boolean;
 begin
   // only if target doesn't already have a model like this
-  ok := RW[pTarget].nModel < nmmax;
+  Ok := RW[pTarget].nModel < nmmax;
   MakeModelInfo(pSender, mix, RW[pSender].Model[mix], miSender);
   for I := 0 to RW[pTarget].nModel - 1 do
@@ -3496 +3496 @@
     MakeModelInfo(pTarget, I, RW[pTarget].Model[I], miTarget);
     if IsSameModel(miSender, miTarget) then
-      ok := False;
-  end;
-  if ok then
+      Ok := False;
+  end;
+  if Ok then
   begin
     RW[pTarget].Model[RW[pTarget].nModel] := RW[pSender].Model[mix];

trunk/GameServer.pas

@@ -2697 +2697 @@
   ShowShipChange: TShowShipChange;
   ShowNegoData: TShowNegoData;
-  logged, ok, HasShipChanged, AllHumansDead, OfferFullySupported: Boolean;
+  Logged, Ok, HasShipChanged, AllHumansDead, OfferFullySupported: Boolean;
 begin
   if Command = sTurn then
@@ -2779 +2779 @@
     FormerCLState := CL.State;
     CL.Put(Command, Player, Subject, @Data);
-    logged := True;
+    Logged := True;
   end
   else
-    logged := False;
+    Logged := False;
 
   case Command of
@@ -3222 +3222 @@
         if Command = sReload then
         begin
-          ok := (Difficulty[0] = 0) and (bix[0].Kind <> btNoTerm) and
+          Ok := (Difficulty[0] = 0) and (bix[0].Kind <> btNoTerm) and
             (Integer(Data) >= 0) and (Integer(Data) < GTurn);
           for p1 := 1 to nPl - 1 do
             if bix[p1].Kind = btTerm then
-              ok := False;
+              Ok := False;
           // allow reload in AI-only games only
         end
         else
-          ok := Player = 0;
-        if ok then
+          Ok := Player = 0;
+        if Ok then
         begin
           if (Command = sBreak) or (Command = sResign) then
@@ -3351 +3351 @@
           p1 := pTurn;
         if (Command and not sExecute = scDipBreak and not sExecute) and
-          (LastEndClientCommand <> scDipBreak) then // ok
+          (LastEndClientCommand <> scDipBreak) then // Ok
         else if (Command and not sExecute = scDipNotice and not sExecute) and
           ((LastEndClientCommand = scDipCancelTreaty) or
-          (LastEndClientCommand = scDipBreak)) then // ok
+          (LastEndClientCommand = scDipBreak)) then // Ok
         else if (Command and not sExecute = scDipAccept and not sExecute) and
           (LastEndClientCommand = scDipOffer) then
@@ -3691 +3691 @@
             if (Mode = moPlaying) and (Subject = adMilitary) then
               IntServer(sIntSetDevModel, Player, 0, DevModel.Kind);
-            // save DevModel, because sctModel commands are not logged
+            // save DevModel, because sctModel commands are not Logged
             ResearchTech := Subject;
           end;
@@ -4478 +4478 @@
     else
     begin
-      if logged then
+      if Logged then
         CL.State := FormerCLState;
       if (Result < rExecuted) and (Command >= sExecute) then

trunk/LocalPlayer/CityType.pas

@@ -23 +23 @@
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure DeleteBtnClick(Sender: TObject);
-  public
-    procedure ShowNewContent(NewMode: TWindowMode);
   protected
     procedure OffscreenPaint; override;
@@ -30 +28 @@
     nPool, dragiix, ctype: Integer;
     Pooliix: array [0 .. nImp - 1] of Integer;
-    listed: Set of 0 .. nImp;
+    Listed: set of 0 .. nImp;
     Changed: Boolean;
     procedure LoadType(NewType: Integer);
     procedure SaveType;
+  public
+    procedure ShowNewContent(NewMode: TWindowMode);
   end;
 
@@ -158 +158 @@
   nPool := 0;
   for iix := nWonder to nImp - 1 do
-    if not(iix in listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
+    if not(iix in Listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
       and (Imp[iix].Preq <> preNA) and
       ((Imp[iix].Preq = preNone) or (MyRO.Tech[Imp[iix].Preq] >= tsApplicable))
@@ -195 +195 @@
 begin
   ctype := NewType;
-  listed := [];
+  Listed := [];
   I := 0;
   while MyData.ImpOrder[ctype, I] >= 0 do
   begin
-    Include(listed, MyData.ImpOrder[ctype, I]);
+    Include(Listed, MyData.ImpOrder[ctype, I]);
     Inc(I);
   end;
@@ -295 +295 @@
     Assert(MyData.ImpOrder[ctype, I] = iix);
     Move(MyData.ImpOrder[ctype, I + 1], MyData.ImpOrder[ctype, I], nImp - I);
-    Exclude(listed, iix);
+    Exclude(Listed, iix);
   end;
 
@@ -308 +308 @@
       (Y < yList + nListRow * 32) then
     begin
-      if dragiix in listed then
+      if dragiix in Listed then
         UnList(dragiix);
       I := (X - xList) div 42 + (Y - yList) div 32 * nListCol;
@@ -316 +316 @@
         nImp - I - 1);
       MyData.ImpOrder[ctype, I] := dragiix;
-      Include(listed, dragiix);
+      Include(Listed, dragiix);
       Changed := True;
     end
-    else if (dragiix in listed) and (X >= xPool) and (X < xPool + nPoolCol * 42)
+    else if (dragiix in Listed) and (X >= xPool) and (X < xPool + nPoolCol * 42)
       and (Y >= yPool) and (Y < yPool + nPoolRow * 32) then
     begin
@@ -340 +340 @@
 begin
   FillChar(MyData.ImpOrder[ctype], SizeOf(MyData.ImpOrder[ctype]), Byte(-1));
-  listed := [];
+  Listed := [];
   Changed := True;
   SmartUpdateContent;

trunk/LocalPlayer/ClientTools.pas

@@ -446 +446 @@
     eDied - job done and died (thurst) }
 var
-  stage, NextJob, Tile: Integer;
-  Done: set of jNone .. jPoll;
+  Stage, NextJob, Tile: Integer;
+  Done: set of jNone..jPoll;
 begin
   Done := [];
@@ -470 +470 @@
   while (Result <> eOK) and (Result <> eDied) do
   begin
-    stage := -1;
+    Stage := -1;
     repeat
-      if stage = -1 then
+      if Stage = -1 then
         NextJob := jPoll
       else
-        NextJob := Jobs[Tile and fTerrain, stage];
+        NextJob := Jobs[Tile and fTerrain, Stage];
       if (NextJob = jNone) or not (NextJob in Done) then
         Break;
-      Inc(stage);
-    until stage = 5;
-    if (stage = 5) or (NextJob = jNone) then
+      Inc(Stage);
+    until Stage = 5;
+    if (Stage = 5) or (NextJob = jNone) then
     begin
       Result := eJobDone;

trunk/LocalPlayer/Draft.pas

@@ -27 +27 @@
     procedure PaintBox1MouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
-  public
-    procedure ShowNewContent(NewMode: TWindowMode);
-  protected
-    procedure OffscreenPaint; override;
   private
     Domain, MaxLines, Lines, Cut, yDomain, yFeature, yWeight, yTotal, yView,
@@ -38 +34 @@
     function IsFeatureInList(D, I: Integer): Boolean;
     procedure SetDomain(D: Integer);
+  protected
+    procedure OffscreenPaint; override;
+  public
+    procedure ShowNewContent(NewMode: TWindowMode);
   end;
 
@@ -211 +211 @@
         Y := yTotal + 76;
         LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2, Y,
-          Phrases.Lookup('COSTDIFF' + char(48 + G.Difficulty[Me])));
+          Phrases.Lookup('COSTDIFF' + Char(48 + G.Difficulty[Me])));
         LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
           xTotal2 + 148 + 30, Y, '=');

trunk/LocalPlayer/Enhance.pas

@@ -39 +39 @@
   private
     NoMap: TIsoMap;
-  public
-    procedure ShowNewContent(NewMode: TWindowMode; TerrType: Integer = -1);
   protected
     Page: Integer;
     procedure OffscreenPaint; override;
+  public
+    procedure ShowNewContent(NewMode: TWindowMode; TerrType: Integer = -1);
   end;
 

trunk/LocalPlayer/Help.pas

@@ -113 +113 @@
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure SearchBtnClick(Sender: TObject);
-  protected
-    procedure OffscreenPaint; override;
   private
     Kind: TLinkCategory;
@@ -141 +139 @@
     procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
+  protected
+    procedure OffscreenPaint; override;
   public
     HistItems: THistItems;

trunk/LocalPlayer/NatStat.pas

@@ -32 +32 @@
     procedure ScrollDownBtnClick(Sender: TObject);
     procedure TellAIBtnClick(Sender: TObject);
-  public
-    procedure CheckAge;
-    procedure ShowNewContent(NewMode: TWindowMode; P: Integer = -1);
-    procedure EcoChange;
   protected
     procedure OffscreenPaint; override;
@@ -50 +46 @@
     ReportText: TStringList;
     procedure GenerateReportText;
+  public
+    procedure CheckAge;
+    procedure ShowNewContent(NewMode: TWindowMode; P: Integer = -1);
+    procedure EcoChange;
   end;
 
@@ -244 +244 @@
             if ExtinctPart then
               S := '(' + S + ')';
-            ReportText.Add(char(48 + Treaty) + S);
+            ReportText.Add(Char(48 + Treaty) + S);
           end;
   end;

trunk/LocalPlayer/Nego.pas

@@ -481 +481 @@
 procedure TNegoDlg.OffscreenPaint;
 var
-  I, cred: Integer;
+  I, Cred: Integer;
   S: string;
   OkEnabled: Boolean;
@@ -600 +600 @@
   // show credibility
   Offscreen.Canvas.Font.Assign(UniFont[ftTiny]);
-  cred := MyRO.EnemyReport[DipMem[Me].pContact].Credibility;
-  case cred of
+  Cred := MyRO.EnemyReport[DipMem[Me].pContact].Credibility;
+  case Cred of
     0 .. 49:
       I := 3;
@@ -609 +609 @@
       I := 1;
   end;
-  PaintProgressBar(Offscreen.Canvas, I, xCred0, yCred0 + 17, (cred + 2) div 5,
+  PaintProgressBar(Offscreen.Canvas, I, xCred0, yCred0 + 17, (Cred + 2) div 5,
     0, 20, MainTexture);
-  S := IntToStr(cred);
+  S := IntToStr(Cred);
   RisedTextOut(Offscreen.Canvas, xCred0 + 10 -
     (BiColorTextWidth(Offscreen.Canvas, S) + 1) div 2, yCred0, S);

trunk/LocalPlayer/Rates.pas

@@ -45 +45 @@
 procedure TRatesDlg.OffscreenPaint;
 var
-  P, X, Y, current, Max, I: Integer;
+  P, X, Y, Current, Max, I: Integer;
   S, s1: string;
 begin
@@ -112 +112 @@
     X := 16;
     Y := 81;
-    current := (100 - MyRO.LuxRate - MyRO.TaxRate) * 120 div 100;
+    Current := (100 - MyRO.LuxRate - MyRO.TaxRate) * 120 div 100;
     Max := 120;
     Frame(Offscreen.Canvas, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
@@ -119 +119 @@
     with Offscreen.Canvas do
     begin
-      for I := 0 to current div 8 - 1 do
+      for I := 0 to Current div 8 - 1 do
         BitBltBitmap(Offscreen, X + Max - 8 - I * 8, Y, 8, 7,
           HGrSystem.Data, 104, 9 + 8 * 2);
-      BitBltBitmap(Offscreen, X + Max - current, Y, current - 8 * (current div 8), 7,
+      BitBltBitmap(Offscreen, X + Max - Current, Y, Current - 8 * (Current div 8), 7,
         HGrSystem.Data, 104, 9 + 8 * 2);
       Brush.Color := $000000;
-      FillRect(Rect(X, Y, X + Max - current, Y + 7));
+      FillRect(Rect(X, Y, X + Max - Current, Y + 7));
       Brush.Style := TBrushStyle.bsClear;
     end;

trunk/LocalPlayer/Select.pas

@@ -1073 +1073 @@
   PPicture, PTestPicture: ^TModelPicture;
   ModelOk: array [0 .. 4095] of Boolean;
-  ok: Boolean;
+  Ok: Boolean;
 begin
   for I := 0 to MaxLayer - 1 do
@@ -1108 +1108 @@
         begin
           { if MyModel[i].Kind=mkSlaves then
-            ok:= MyRO.Wonder[woPyramids].EffectiveOwner=Me
+            Ok:= MyRO.Wonder[woPyramids].EffectiveOwner=Me
             else } if MyModel[I].Domain = dSea then
           begin
-            ok := False;
+            Ok := False;
             for dx := -2 to 2 do
               for dy := -2 to 2 do
@@ -1120 +1120 @@
                     ((MyMap[Loc1] and fTerrain = fShore) or
                     (MyMap[Loc1] and fCanal > 0)) then
-                    ok := True;
+                    Ok := True;
                 end;
           end
           else
-            ok := True;
-          if ok then
+            Ok := True;
+          if Ok then
           begin
             if MyModel[I].Status and msObsolete = 0 then
@@ -1163 +1163 @@
           Inc(Lines[0]);
         end;
-        ok := False;
+        Ok := False;
         for I := 0 to nDomains - 1 do
           if (upgrade[I, 0].Preq = preNone) or
             (MyRO.Tech[upgrade[I, 0].Preq] >= tsApplicable) then
-            ok := True;
-        if ok then { new unit class }
+            Ok := True;
+        if Ok then { new unit class }
         begin
           Code[0, Lines[0]] := adMilitary;
@@ -1255 +1255 @@
         for I := 0 to nAdv - 1 do
         begin
-          ok := (MyRO.Tech[I] <> tsNA) or (MyRO.ResearchTech = I);
+          Ok := (MyRO.Tech[I] <> tsNA) or (MyRO.ResearchTech = I);
           for J := 1 to nColumn - 1 do
             with MyRO.EnemyReport[Column[J]]^ do
               if (Tech[I] <> tsNA) or (TurnOfCivilReport >= 0) and
                 (ResearchTech = I) then
-                ok := True;
-          if ok then
+                Ok := True;
+          if Ok then
           begin
             Code[0, Lines[0]] := I;
@@ -1269 +1269 @@
         SortTechs;
 
-        ok := MyRO.ResearchTech = adMilitary;
+        Ok := MyRO.ResearchTech = adMilitary;
         for J := 1 to nColumn - 1 do
           with MyRO.EnemyReport[Column[J]]^ do
             if (MyRO.Alive and (1 shl Column[J]) <> 0) and
               (TurnOfCivilReport >= 0) and (ResearchTech = adMilitary) then
-              ok := True;
-        if ok then
+              Ok := True;
+        if Ok then
         begin
           Code[0, Lines[0]] := adMilitary;
@@ -1330 +1330 @@
         begin // check if opponent already has this model
           MakeModelInfo(Me, mix, MyModel[mix], mi);
-          ok := True;
+          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
-              ok := False;
-          if ok then
+              Ok := False;
+          if Ok then
           begin
             Code[0, Lines[0]] := mix;
@@ -1414 +1414 @@
             if not Assigned(PPicture.HGr) then
               InitEnemyModel(emix);
-            ok := True;
+            Ok := True;
             if MainScreen.mNames.Checked then
               for J := 0 to Lines[0] - 1 do
@@ -1426 +1426 @@
                 begin
                   Code[1, J] := 1;
-                  ok := False;
+                  Ok := False;
                   Break;
                 end;
               end;
-            if ok then
+            if Ok then
             begin
               Code[0, Lines[0]] := emix;

trunk/LocalPlayer/Term.pas

@@ -421 +421 @@
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
-    procedure PaintZoomedTile(dst: TBitmap; X, Y, Loc: Integer);
+    procedure PaintZoomedTile(Dst: TBitmap; X, Y, Loc: Integer);
   public
     UsedOffscreenWidth: Integer;
@@ -850 +850 @@
 function AttackSound(Code: Integer): string;
 begin
-  Result := 'ATTACK_' + char(48 + Code div 100 mod 10) +
-    char(48 + Code div 10 mod 10) + char(48 + Code mod 10);
+  Result := 'ATTACK_' + Char(48 + Code div 100 mod 10) +
+    Char(48 + Code div 10 mod 10) + Char(48 + Code mod 10);
 end;
 
@@ -931 +931 @@
           else OpenSound:=AttackSound(ModelCode(mi)); }
         if MyModel[MyData.ToldModels].Kind = mkSelfDeveloped then
-          OpenSound := 'NEWMODEL_' + char(48 + Age);
+          OpenSound := 'NEWMODEL_' + Char(48 + Age);
         MessgText := Phrases.Lookup('MODELAVAILABLE');
         if GameMode = cMovie then
@@ -989 +989 @@
 end;
 
-procedure TMainScreen.PaintZoomedTile(dst: TBitmap; X, Y, Loc: Integer);
+procedure TMainScreen.PaintZoomedTile(Dst: TBitmap; X, Y, Loc: Integer);
 
   procedure TSprite(xDst, yDst, xSrc, ySrc: Integer);
   begin
     with NoMapPanel do
-      Sprite(dst, HGrTerrain, X + xDst, Y + yDst, xxt * 2, yyt * 3,
+      Sprite(Dst, HGrTerrain, X + xDst, Y + yDst, xxt * 2, yyt * 3,
         1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
   end;
@@ -1001 +1001 @@
   begin
     with NoMapPanel do begin
-      Sprite(dst, HGrTerrain, X + xxt, Y + yyt + 2, xxt * 2, yyt * 2 - 2,
+      Sprite(Dst, HGrTerrain, X + xxt, Y + yyt + 2, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 3 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, X + 4, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(Dst, HGrTerrain, X + 4, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         5 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, X + xxt * 2, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(Dst, HGrTerrain, X + xxt * 2, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, X + xxt, Y + yyt * 3, xxt * 2, yyt * 2 - 2,
+      Sprite(Dst, HGrTerrain, X + xxt, Y + yyt * 3, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
     end;
@@ -1519 +1519 @@
   Color: TColor;
   Name: string;
-  ok: Boolean;
+  Ok: Boolean;
 begin
   UnusedTribeFiles.Clear;
-  ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*' + CevoTribeExt,
+  Ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*' + CevoTribeExt,
     faArchive + faReadOnly, SearchRec) = 0;
-  if not ok then
+  if not Ok then
   begin
     FindClose(SearchRec);
-    ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*' + CevoTribeExt),
+    Ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*' + CevoTribeExt),
       faArchive + faReadOnly, SearchRec) = 0;
   end;
-  if ok then
+  if Ok then
     repeat
       SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - Length(CevoTribeExt));
@@ -2078 +2078 @@
         else
         begin
-          S := Tribe[Me].TPhrase('AGE' + char(48 + Age));
+          S := Tribe[Me].TPhrase('AGE' + Char(48 + Age));
           MessgText := Format(S, [TurnToString(MyRO.Turn)]);
         end;
@@ -2086 +2086 @@
         { else begin Kind:=mkOkHelp; HelpKind:=hkAdv; HelpNo:=AgePreq[age]; end };
         CenterTo := NewAgeCenterTo;
-        OpenSound := 'AGE_' + char(48 + Age);
+        OpenSound := 'AGE_' + Char(48 + Age);
         Application.ProcessMessages;
         ShowModal;
@@ -2250 +2250 @@
           Item := 'RESEARCH_GENERAL';
           if GameMode <> cMovie then
-            OpenSound := 'NEWADVANCE_' + char(48 + Age);
+            OpenSound := 'NEWADVANCE_' + Char(48 + Age);
           Item2 := Phrases.Lookup('ADVANCES', ad);
           if ad in FutureTech then
@@ -2444 +2444 @@
               begin // !!! Shinkansen
                 MoveResult := eOK;
-                ok := True;
+                Ok := True;
                 for I := 0 to MoveAdviceData.nStep - 1 do
                 begin
@@ -2454 +2454 @@
                   // don't attack during auto move
                   begin
-                    ok := False;
-                    Break
+                    Ok := False;
+                    Break;
                   end
                   else
@@ -2471 +2471 @@
                     then
                     begin
-                      ok := False;
+                      Ok := False;
                       Break;
                     end;
@@ -2478 +2478 @@
                 Stop := not ok or (Loc = MoveAdviceData.ToLoc) or
                   (MoveAdviceData.ToLoc = maNextCity) and
-                  (MyMap[Loc] and fCity <> 0)
+                  (MyMap[Loc] and fCity <> 0);
               end
               else
@@ -2977 +2977 @@
           with MessgExDlg do
           begin
-            OpenSound := 'CONTACT_' + char(48 + MyRO.EnemyReport[Integer(Data)
+            OpenSound := 'CONTACT_' + Char(48 + MyRO.EnemyReport[Integer(Data)
               ].Attitude);
             MessgText := Tribe[Integer(Data)].TPhrase('FRCONTACT');
@@ -3005 +3005 @@
         InitTurn(NewPlayer);
         if Command = scDipStart then
-          Play('CONTACT_' + char(48 + MyRO.Attitude[DipMem[NewPlayer]
+          Play('CONTACT_' + Char(48 + MyRO.Attitude[DipMem[NewPlayer]
             .pContact]))
         else if Command = scDipCancelTreaty then
@@ -4718 +4718 @@
 var
   ProcessOptions: Integer;
-  rec: TRect;
+  Rec: TRect;
   DoInvalidate: Boolean;
 begin
@@ -4759 +4759 @@
         Exit; { map window not moved }
       Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-      rec := Rect(0, 0, MapWidth, MapHeight);
+      Rec := Rect(0, 0, MapWidth, MapHeight);
 {$IFDEF WINDOWS}
       ScrollDC(Offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
@@ -4766 +4766 @@
 {$IFDEF UNIX}
       ScrollDC(Offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-        rec, rec, 0, nil);
+        Rec, Rec, 0, nil);
 {$ENDIF}
       for DoInvalidate := False to FastScrolling do begin
         if DoInvalidate then begin
-          rec.Bottom := MapHeight - Overlap;
+          Rec.Bottom := MapHeight - Overlap;
 {$IFDEF WINDOWS}
           ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
@@ -4777 +4777 @@
 {$IFDEF UNIX}
           ScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-            rec, rec, 0, nil);
+            Rec, Rec, 0, nil);
 {$ENDIF}
           ProcessOptions := prInvalidate;
@@ -7153 +7153 @@
     else if BHelp.Test(ShortCut) then mHelp.Click;
     (*if Shift = [ssCtrl] then
-      case char(Key) of
+      case Char(Key) of
          'A':
           begin // auto symmetry

trunk/LocalPlayer/Tribes.pas

@@ -430 +430 @@
     I := 0;
     while (I < Count) and (Copy(Strings[I], 1, 6) <>
-        '#AGE' + char(48 + Age) + ' ') do
+        '#AGE' + Char(48 + Age) + ' ') do
       Inc(I);
     if I < Count then
@@ -489 +489 @@
 var
   I: Integer;
-  ok: Boolean;
+  Ok: Boolean;
 begin
   with Info do
@@ -516 +516 @@
 
       // read model name from tribe script
-      ok := False;
+      Ok := False;
       for I := 0 to Script.Count - 1 do
       begin
         Input := Script[I];
         if Input = '#UNITS ' + ExtractFileNameOnly(GrName) then
-          ok := True
+          Ok := True
         else if (Input <> '') and (Input[1] = '#') then
-          ok := False
-        else if ok and (GetNum = pix) then
+          Ok := False
+        else if Ok and (GetNum = pix) then
         begin
           Get;

trunk/LocalPlayer/UnitStat.pas

@@ -293 +293 @@
   end;
 
-  procedure FeatureBar(dst: TBitmap; X, Y: Integer; const mi: TModelInfo;
+  procedure FeatureBar(Dst: TBitmap; X, Y: Integer; const mi: TModelInfo;
     T: TTexture);
   var
-    I, W, dx, num: Integer;
+    I, W, dx, Num: Integer;
     S: string;
   begin
-    DarkGradient(dst.Canvas, X - 6, Y + 1, 180, 1);
-    with dst.Canvas do
+    DarkGradient(Dst.Canvas, X - 6, Y + 1, 180, 1);
+    with Dst.Canvas do
       if mi.Kind >= $10 then
       begin
@@ -315 +315 @@
         for I := 3 to nFeature - 1 do
         begin
-          num := 0;
+          Num := 0;
           case I of
             mcSeaTrans:
               if mi.Domain = dSea then
-                num := mi.TTrans;
+                Num := mi.TTrans;
             mcCarrier:
               if mi.Domain = dSea then
-                num := mi.ATrans_Fuel;
+                Num := mi.ATrans_Fuel;
             mcBombs:
-              num := mi.Bombs;
+              Num := mi.Bombs;
             mcFuel:
               if mi.Domain = dAir then
-                num := mi.ATrans_Fuel;
+                Num := mi.ATrans_Fuel;
             mcAirTrans:
               if mi.Domain = dAir then
-                num := mi.TTrans;
+                Num := mi.TTrans;
             mcFirstNonCap .. nFeature - 1:
               if mi.Cap and (1 shl (I - mcFirstNonCap)) <> 0 then
-                num := 1;
+                Num := 1;
           end;
-          if (num > 0) and
+          if (Num > 0) and
             ((I <> mcSE) or (mi.Cap and (1 shl (mcNP - mcFirstNonCap)) = 0))
           then
           begin
-            if num > 1 then
+            if Num > 1 then
             begin
-              S := IntToStr(num);
+              S := IntToStr(Num);
               W := TextWidth(S);
               Brush.Color := $FFFFFF;
@@ -352 +352 @@
             FrameRect(Rect(X - 3 + dx, Y + 2, X + 11 + dx, Y + 16));
             Brush.Style := TBrushStyle.bsClear;
-            Sprite(dst, HGrSystem, X - 1 + dx, Y + 4, 10, 10,
+            Sprite(Dst, HGrSystem, X - 1 + dx, Y + 4, 10, 10,
               66 + I mod 11 * 11, 137 + I div 11 * 11);
             Inc(dx, 15);
@@ -360 +360 @@
   end;
 
-  procedure NumberBarS(dst: TBitmap; X, Y: Integer; Cap, S: string; T: TTexture);
-  begin
-    DLine(dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade, T.ColorBevelLight);
-    LoweredTextOut(dst.Canvas, -1, T, X - 2, Y, Cap);
-    RisedTextout(dst.Canvas, X + 170 - BiColorTextWidth(dst.Canvas, S), Y, S);
+  procedure NumberBarS(Dst: TBitmap; X, Y: Integer; Cap, S: string; T: TTexture);
+  begin
+    DLine(Dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade, T.ColorBevelLight);
+    LoweredTextOut(Dst.Canvas, -1, T, X - 2, Y, Cap);
+    RisedTextout(Dst.Canvas, X + 170 - BiColorTextWidth(Dst.Canvas, S), Y, S);
   end;
 

trunk/Log.pas

@@ -73 +73 @@
     if List.Lines.Count = MaxLines then
       List.Lines.Delete(0);
-    List.Lines.Add(char(48 + Turn div 100 mod 10) +
-      char(48 + Turn div 10 mod 10) + char(48 + Turn mod 10) + ' ' + Text);
+    List.Lines.Add(Char(48 + Turn div 100 mod 10) +
+      Char(48 + Turn div 10 mod 10) + Char(48 + Turn mod 10) + ' ' + Text);
     PostMessage(List.Handle, WM_VSCROLL, SB_BOTTOM, 0);
     Update;

trunk/NoTerm.pas

@@ -386 +386 @@
   Shift: TShiftState);
 begin
-  if (char(Key) = 'M') and (ssCtrl in Shift) then
+  if (Char(Key) = 'M') and (ssCtrl in Shift) then
     if LogDlg.Visible then
       LogDlg.Close

trunk/Packages/CevoComponents/ButtonA.pas

@@ -14 +14 @@
     procedure SetCaption(Text: string);
     procedure SetFont(const Font: TFont);
+  protected
+    procedure Paint; override;
+  public
+    property Font: TFont write SetFont;
   published
     property Visible;
     property Caption: string read FCaption write SetCaption;
     property OnClick;
-  public
-    property Font: TFont write SetFont;
-  protected
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ButtonB.pas

@@ -14 +14 @@
     FIndex: Integer;
     procedure SetIndex(Text: Integer);
+  protected
+    procedure Paint; override;
   public
     property Mask: TBitmap read FMask write FMask;
@@ -20 +22 @@
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
-  protected
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -140 +140 @@
 // procedure TButtonBase.PlayDownSound;
 // begin
-// if DownSound<>'' then SndPlaySound(pchar(DownSound),SND_ASYNC)
+// if DownSound<>'' then SndPlaySound(PChar(DownSound),SND_ASYNC)
 // end;
 
 // procedure TButtonBase.PlayUpSound;
 // begin
-// if UpSound<>'' then SndPlaySound(pchar(UpSound),SND_ASYNC)
+// if UpSound<>'' then SndPlaySound(PChar(UpSound),SND_ASYNC)
 // end;
 

trunk/Packages/CevoComponents/ButtonC.pas

@@ -12 +12 @@
     FIndex: Integer;
     procedure SetIndex(Text: Integer);
+  protected
+    procedure Paint; override;
   published
     property Visible;
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
-  protected
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ButtonN.pas

@@ -20 +20 @@
     procedure SetIndex(X: Integer);
     procedure SetSmartHint(X: string);
+  protected
+    procedure Paint; override;
+    procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
+      X, Y: Integer); override;
   published
     property Possible: Boolean read FPossible write SetPossible;
@@ -29 +33 @@
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick: TNotifyEvent read ChangeProc write ChangeProc;
-  protected
-    procedure Paint; override;
-    procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
-      X, Y: Integer); override;
   end;
 

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -43 +43 @@
     procedure FormCreate(Sender: TObject);
     procedure FormPaint(Sender: TObject);
-  public
-    MessgText: string;
   protected
     Lines: Integer;
@@ -50 +48 @@
     procedure SplitText(Preview: Boolean);
     procedure CorrectHeight;
+  public
+    MessgText: string;
   end;
 

trunk/Packages/CevoComponents/EOTButton.pas

@@ -17 +17 @@
   // EndOfTurn button
   TEOTButton = class(TButtonBase)
+  private
+    FTemplate: TBitmap;
+    FIndex: Integer;
+    procedure SetIndex(X: Integer);
+  protected
+    Buffer, Back: TBitmap;
+    procedure Paint; override;
   public
     constructor Create(aOwner: TComponent); override;
@@ -22 +29 @@
     procedure SetButtonIndexFast(X: Integer);
     procedure SetBack(Canvas: TCanvas; X, Y: Integer);
-  private
-    FTemplate: TBitmap;
-    FIndex: Integer;
-    procedure SetIndex(X: Integer);
-  public
     property Template: TBitmap read FTemplate write FTemplate;
   published
@@ -32 +34 @@
     property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
-  protected
-    Buffer, Back: TBitmap;
-    procedure Paint; override;
   end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -1040 +1040 @@
       else begin
         DstPtr.NextPixel;
-        continue;
+        Continue;
       end;
       if R = 0 then

trunk/Packages/CevoComponents/Sound.pas

@@ -315 +315 @@
   Result := (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*');
   if Result then
-    // SndPlaySound(pchar(GetSoundsDir + DirectorySeparator + WavFileName + '.wav'), SND_ASYNC)
+    // SndPlaySound(PChar(GetSoundsDir + DirectorySeparator + WavFileName + '.wav'), SND_ASYNC)
     PlaySound(GetSoundsDir + DirectorySeparator + WavFileName);
 end;

trunk/Packages/Common/Common.pas

@@ -184 +184 @@
 (*function DelTree(DirName : string): Boolean;
 var
-  SHFileOpStruct : TSHFileOpStruct;
-  DirBuf : array [0..255] of char;
+  SHFileOpStruct: TSHFileOpStruct;
+  DirBuf: array [0..255] of char;
 begin
   DirName := UTF8Decode(DirName);
   try
-    Fillchar(SHFileOpStruct,Sizeof(SHFileOpStruct),0) ;
-    FillChar(DirBuf, Sizeof(DirBuf), 0 ) ;
-    StrPCopy(DirBuf, DirName) ;
+    FillChar(SHFileOpStruct, Sizeof(SHFileOpStruct), 0);
+    FillChar(DirBuf, Sizeof(DirBuf), 0 );
+    StrPCopy(DirBuf, DirName);
     with SHFileOpStruct do begin
       Wnd := 0;
@@ -200 +200 @@
       fFlags := fFlags or FOF_SILENT;
     end;
-    Result := (SHFileOperation(SHFileOpStruct) = 0) ;
+    Result := (SHFileOperation(SHFileOpStruct) = 0);
   except
-     Result := False;
+    Result := False;
   end;
 end;*)

trunk/Start.pas

@@ -1623 +1623 @@
   NewName: string;
   F: file;
-  ok: Boolean;
+  Ok: Boolean;
   MapPictureFileName: string;
 begin
@@ -1652 +1652 @@
         AssignFile(F, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
           CevoMapExt);
-      ok := True;
+      Ok := True;
       try
         if Page = pgLoad then
@@ -1660 +1660 @@
       except
         // Play('INVALID');
-        ok := False;
+        Ok := False;
       end;
       if Page <> pgLoad then begin
@@ -1674 +1674 @@
         end;
       end;
-      if ok then begin
+      if Ok then begin
         if Page = pgLoad then
           FormerGames[List.ItemIndex] := NewName