Changeset 442 for trunk

Timestamp:

May 18, 2022, 10:43:27 PM (2 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• AI/StdAI/AI.pas (modified) (17 diffs)
• AI/StdAI/Barbarina.pas (modified) (2 diffs)
• AI/StdAI/ToolAI.pas (modified) (14 diffs)
• Database.pas (modified) (71 diffs)
• GameServer.pas (modified) (7 diffs)
• IPQ.pas (modified) (2 diffs)
• Inp.pas (modified) (1 diff)
• LocalPlayer/Battle.pas (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/CityType.pas (modified) (1 diff)
• LocalPlayer/ClientTools.pas (modified) (2 diffs)
• LocalPlayer/Diagram.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Enhance.pas (modified) (2 diffs)
• LocalPlayer/IsoEngine.pas (modified) (5 diffs)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• LocalPlayer/NatStat.pas (modified) (2 diffs)
• LocalPlayer/Nego.pas (modified) (7 diffs)
• LocalPlayer/PVSB.pas (modified) (1 diff)
• LocalPlayer/Rates.pas (modified) (2 diffs)
• LocalPlayer/Select.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (3 diffs)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• LocalPlayer/Wonders.pas (modified) (1 diff)
• Log.pas (modified) (1 diff)
• NoTerm.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (1 diff)
• Platform.pas (modified) (1 diff)
• Start.pas (modified) (1 diff)
• UBrain.pas (modified) (1 diff)
• UMiniMap.pas (modified) (1 diff)
• UnitProcessing.pas (modified) (49 diffs)

trunk/AI/StdAI/AI.pas

@@ -176 +176 @@
   LeaveOutValue: array[0..nAdv - 1] of integer;
 
-
 constructor TAI.Create(Nation: integer);
 begin
@@ -209 +208 @@
   Result := Data.BehaviorFlags and bBarbarina <> 0;
 end;
-
 
 //-------------------------------
@@ -653 +651 @@
       Result := ad;
 end;
-
 
 //-------------------------------
@@ -1145 +1142 @@
         end;
       end;
-end; // ProcessSettlers
-
+end;
 
 //-------------------------------
@@ -1350 +1346 @@
   SetAdvanceValues;
 
-
 {$IFDEF DEBUG}
 (*for p1:=0 to nPl-1 do
@@ -1380 +1375 @@
     end;
 end;
-
 {$ENDIF}
-
 
 procedure TAI.CheckGender;
@@ -1416 +1409 @@
   end;
 end;
-
 
 procedure TAI.SetAdvanceValues;
@@ -1785 +1777 @@
 end;
 
-
 procedure TAI.MoveUnitsHome;
 const
@@ -2055 +2046 @@
             Dec(UnitLack[District[Loc], ModelCat[mix]])
         end;
-end; // MoveUnitsHome
-
+end;
 
 procedure TAI.CheckAttack(uix: integer);
@@ -2176 +2166 @@
     until Exhausted;
   end;
-end; // CheckAttack
-
+end;
 
 procedure TAI.Patrol(uix: integer);
@@ -2282 +2271 @@
     until Exhausted;
   end;
-end; // Patrol
+end;
 
 procedure TAI.AttackAndPatrol;
@@ -2342 +2331 @@
           Patrol(uix);
       end;
-end; // AttackAndPatrol
-
+end;
 
 function TAI.HavePort: boolean;
@@ -2369 +2357 @@
       end;
 end;
-
 
 procedure TAI.SetCityProduction;
@@ -2836 +2823 @@
 
   ChangeHomeCities;
-end; // SetCityProduction
-
+end;
 
 function TAI.ChooseGovernment: integer;
@@ -2855 +2841 @@
     Result := gDespotism;
 end;
-
 
 //-------------------------------
@@ -2927 +2912 @@
     end;
 end;
-
 
 function TAI.WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean;
@@ -3153 +3137 @@
     end;
   end;
-end; // Negotiation
-
+end;
 
 procedure SetLeaveOutValue;

trunk/AI/StdAI/Barbarina.pas

@@ -833 +833 @@
   if Result then
     Moved[uix] := True;
-end; // ProcessMove
+end;
 
 procedure TBarbarina.AttackAndPatrol;
@@ -1205 +1205 @@
             end
   until not BackToStart;
-end; // AttackAndPatrol
+end;
 
 procedure TBarbarina.Barbarina_SetCityProduction;

trunk/AI/StdAI/ToolAI.pas

@@ -106 +106 @@
   end;
 
-
 const
   // no-formations
@@ -132 +131 @@
   mxAdjacent = $00000001;
 
-
 var
   nContinent, nOcean, nDistrict: integer;
@@ -145 +143 @@
 // total number of prerequisites for each advance
 
-
 implementation
 
@@ -166 +163 @@
   TurnsAfterLoad: array[0..lxmax * lymax - 1] of shortint;
 
-
 procedure ReplaceD(Start, Stop: pinteger; Raider, Twix: integer);
 begin
@@ -183 +179 @@
   Result := Start;
 end;
-
 
 function TToolAI.CenterOfEmpire: integer;
@@ -263 +258 @@
 end;
 
-
 //------------------------------------------------------------------------------
 // City Tiles Processing
@@ -311 +305 @@
       end;
 end;
-
 
 //------------------------------------------------------------------------------
@@ -469 +462 @@
           Unit_StartJob(uix, TileJob[JobLocOfSettler[uix]]);
       end;
-end; // JobAssignment_Go
-
+end;
 
 //------------------------------------------------------------------------------
@@ -594 +586 @@
   end;
 end;
-
 
 //------------------------------------------------------------------------------
@@ -898 +889 @@
       Result := csForbiddenTile;
   end;
-end; // CheckStep
+end;
 
 (*
@@ -1020 +1011 @@
 end;
 
-
 //------------------------------------------------------------------------------
 // Oversea Transport
@@ -1108 +1098 @@
   Pile.Free;
 end;
-
 
 function TToolAI.SeaTransport_MakeGroupPlan(
@@ -1472 +1461 @@
 end;
 
-
 //------------------------------------------------------------------------------
 // Misc
@@ -1493 +1481 @@
       end;
 end;
-
 
 //------------------------------------------------------------------------------

trunk/Database.pas

@@ -171 +171 @@
 function DoSpyMission(p, pCity, cix, Mission: integer): Cardinal;
 
+
 implementation
 
@@ -247 +248 @@
           if Tiles and (1 shl V21) <> 0 then
             assert(UsedByCity[Radius[V21]] = Loc);
-      end
+      end;
 {$ENDIF}
   end;
-end; // CompactLists
+end;
 
 {
@@ -265 +266 @@
     result := $10000000
   else
-    result := trunc(c0)
+    result := trunc(c0);
 end;
 
@@ -281 +282 @@
         else
           result := result * 4;
-  end
+  end;
 end;
 
@@ -363 +364 @@
         end;
         inc(RW[p].nModel);
-      end
+      end;
     end;
 end;
@@ -380 +381 @@
         Built := 0;
         Lost := 0;
-        ID := p shl 12 + nModel
+        ID := p shl 12 + nModel;
       end;
       inc(nModel);
-      inc(Researched[p])
-    end
+      inc(Researched[p]);
+    end;
 end;
 
@@ -392 +393 @@
   RW[p].Tech[ad] := tsSeen;
   // inc(nTech[p]);
-  inc(Researched[p])
+  inc(Researched[p]);
 end;
 
@@ -403 +404 @@
       for uix := 0 to RW[p1].nUn - 1 do
         if RW[p1].Model[RW[p1].Un[uix].mix].Kind = mkSlaves then
-          RW[p1].Un[uix].Job := jNone
+          RW[p1].Un[uix].Job := jNone;
 end;
 
@@ -475 +476 @@
         GWonder[Wonder].EffectiveOwner := -1;
         if Wonder = woPyramids then
-          FreeSlaves
-      end
+          FreeSlaves;
+      end;
 end;
 
@@ -542 +543 @@
         inc(VicinityLoc[2], lx0);
         inc(VicinityLoc[4], lx0);
-      end
-    end
+      end;
+    end;
   end
   else
@@ -552 +553 @@
       dec(VicinityLoc[0], lx0);
       dec(VicinityLoc[6], lx0);
-    end
+    end;
   end;
 end;
@@ -612 +613 @@
     if (MapSize + 1) mod i = 0 then
       primitive := 0;
-    inc(i)
+    inc(i);
   end;
 
@@ -622 +623 @@
       repeat
         inc(j);
-        i := i * primitive mod (MapSize + 1)
+        i := i * primitive mod (MapSize + 1);
       until (i = 1) or (j = MapSize + 1);
     until j = MapSize;
@@ -629 +630 @@
 function MapGeneratorAvailable: boolean;
 begin
-  result := (primitive > 0) and (lx >= 20) and (ly >= 40)
+  result := (primitive > 0) and (lx >= 20) and (ly >= 40);
 end;
 
@@ -666 +667 @@
     ca[x] := cos(v) / ly;
     f1[x] := 2 * pi * exp(Detail * (x - 1));
-    f2[x] := exp(-x * Smooth)
+    f2[x] := exp(-x * Smooth);
   end;
 
@@ -688 +689 @@
       else
         Elevation[x + lx * y] := Round((v + 4) * 20);
-      inc(ElCount[Elevation[x + lx * y]])
+      inc(ElCount[Elevation[x + lx * y]]);
     end;
 end;
@@ -709 +710 @@
       for i := a to Stop do
         if Continent[i] = a then
-          Continent[i] := b
+          Continent[i] := b;
   end;
 
@@ -736 +737 @@
             ReplaceCont(Continent[Loc - 1], Continent[Loc], Loc);
         if Continent[Loc] = -1 then
-          Continent[Loc] := Loc
-      end
+          Continent[Loc] := Loc;
+      end;
     end;
 
@@ -754 +755 @@
         Wrong := Continent[lx - 1 + lx * (y + 1)];
       if Wrong >= 0 then
-        ReplaceCont(Wrong, Continent[lx * y], MapSize - 1)
+        ReplaceCont(Wrong, Continent[lx * y], MapSize - 1);
     end;
 end;
@@ -797 +798 @@
                 inc(AreaCount[xBlock, yBlock]);
                 if DelphiRandom(AreaCount[xBlock, yBlock]) = 0 then
-                  RareByArea[xBlock, yBlock] := Loc0
-              end
+                  RareByArea[xBlock, yBlock] := Loc0;
+              end;
             end;
           end;
-        end
+        end;
     end;
     totalrare := 0;
@@ -848 +849 @@
               inc(RareAdjacent[(x + 7) mod 8, y + 1]);
             end;
-          end
+          end;
         end;
     xworst := 0;
@@ -862 +863 @@
             xworst := x;
             yworst := y;
-            Cnt := 1
+            Cnt := 1;
           end
           else if (RareAdjacent[x, y] = RareAdjacent[xworst, yworst]) then
@@ -871 +872 @@
               xworst := x;
               yworst := y;
-            end
+            end;
           end;
         end;
     AreaCount[xworst, yworst] := 0;
-    dec(totalrare)
+    dec(totalrare);
   end;
 
@@ -884 +885 @@
       begin
         RareLoc[Cnt] := RareByArea[x, y];
-        inc(Cnt)
+        inc(Cnt);
       end;
   for i := 0 to 11 do
@@ -897 +898 @@
           if (Loc1 >= 0) and (RealMap[Loc1] and fTerrain = fMountains) then
             RealMap[Loc1] := RealMap[Loc1] and not fTerrain or fHills;
-        end
+        end;
   end;
   for i := 0 to 11 do
@@ -921 +922 @@
                 begin
                   iBest := i;
-                  jbest := j
-                end
-              end
+                  jbest := j;
+                end;
+              end;
             end
             else if (Cnt = 0) or (Dist[i, j] > Dist[iBest, jbest]) then
@@ -938 +939 @@
     RareLoc[jbest] := -1;
   end;
-end; // RarePositions
+end;
 
 function CheckShore(Loc: integer): boolean;
@@ -1097 +1098 @@
   begin
     dec(bMountains);
-    inc(plus, ElCount[bMountains])
+    inc(plus, ElCount[bMountains]);
   end;
   Count := plus;
@@ -1105 +1106 @@
   begin
     dec(bHills);
-    inc(plus, ElCount[bHills])
+    inc(plus, ElCount[bHills]);
   end;
   inc(Count, plus);
@@ -1112 +1113 @@
   begin
     dec(bLand);
-    inc(Count, ElCount[bLand])
+    inc(Count, ElCount[bLand]);
   end;
 
@@ -1138 +1139 @@
       end;
       if Count = 8 then
-        RealMap[Loc0] := fOcean
+        RealMap[Loc0] := fOcean;
     end;
 
@@ -1202 +1203 @@
         Loc1 := CopyFrom[Loc1];
       RealMap[Loc0] := RealMap[Loc0] and not fTerrain or
-        RealMap[Loc1] and fTerrain
+        RealMap[Loc1] and fTerrain;
     end;
 
@@ -1225 +1226 @@
           if Loc1 >= 0 then
             if RealMap[Loc1] and fTerrain < fGrass then
-              inc(Count, 2)
+              inc(Count, 2);
         end;
       end;
       if Count >= 4 then
-        RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie
+        RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie;
     end;
 
@@ -1241 +1242 @@
         if Loc1 >= 0 then
           if RealMap[Loc1] and fTerrain <> fDesert then
-            inc(Count)
+            inc(Count);
       end;
       if Count >= 4 then
-        RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie
+        RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie;
     end;
 
@@ -1257 +1258 @@
       RealMap[x + lx * (ly - 2)] := RealMap[x + lx * (ly - 2)] and
         not fTerrain or fTundra;
-    RealMap[x + lx * (ly - 1)] := fArctic
+    RealMap[x + lx * (ly - 1)] := fArctic;
   end;
 
@@ -1355 +1356 @@
         if p1 < nAlive + 1 then
           sc[p1] := sc[p1 - 1];
-        dec(p1)
+        dec(p1);
       end;
       if p1 < nAlive + 1 then
@@ -1370 +1371 @@
       Break; // even least crowded continent is more crowded than smallest
     inc(sccount[c]);
-    dec(nsc)
+    dec(nsc);
   until sccount[nsc] > 1;
 
@@ -1380 +1381 @@
     begin
       inc(CountGood);
-      MinGood := 6
+      MinGood := 6;
     end;
     FillChar(nCityLoc, SizeOf(nCityLoc), 0);
@@ -1401 +1402 @@
               Loc1 := Radius[V21];
               if (Loc1 >= 0) and (Loc1 < MapSize) and IsGoodTile(Loc1) then
-                inc(CntGood)
+                inc(CntGood);
             end;
           if CntGood >= MinGood then
           begin
             CityLoc[c, nCityLoc[c]] := Loc;
-            inc(nCityLoc[c])
+            inc(nCityLoc[c]);
           end;
         end;
@@ -1449 +1450 @@
             TestDist := Distance(TestStartLoc[i], TestStartLoc[j]);
             if TestDist < MinDist then
-              MinDist := TestDist
+              MinDist := TestDist;
           end;
           if i = sccount[c] - 1 then
@@ -1595 +1596 @@
       end;
     end;
-end; { StartPositions }
+end;
 
 procedure PredefinedStartPositions(Human: integer);
@@ -1654 +1655 @@
       end;
   SaveMapCenterLoc := StartLoc[0];
-end; { PredefinedStartPositions }
+end;
 
 procedure InitGame;
@@ -1768 +1769 @@
             Model[nModel].ID := p shl 12 + nModel;
             SetModelFlags(Model[nModel]);
-            inc(nModel)
+            inc(nModel);
           end;
         nUn := 0;
@@ -1790 +1791 @@
   TerritoryCount[nPl] := MapSize;
   // fillchar(NewContact, sizeof(NewContact), false);
-end; // InitGame
+end;
 
 procedure InitRandomGame;
@@ -1897 +1898 @@
     if (NewTile and fTerImp = tiIrrigation) or (NewTile and fTerImp = tiFarm)
     then
-      NewTile := NewTile and not fTerImp
+      NewTile := NewTile and not fTerImp;
   end;
   if (Terrain[NewTile and fTerrain].MineEff = 0) and
@@ -1921 +1922 @@
       RealMap[Loc1] := RealMap[Loc1] or ($F shl 27);
       RW[0].Map[Loc1] := RealMap[Loc1] and $07FFFFFF or fObserved;
-    end
+    end;
   end;
   // RealMap[Loc]:=RealMap[Loc] and not fSpecial;
@@ -2053 +2054 @@
   end;
   result := eOK;
-end; { GetTileInfo }
+end;
 
 procedure Strongest(Loc: integer; var uix, Strength, Bonus, Cnt: integer);
@@ -2136 +2137 @@
       if Health < 100 then
         result := ((result - 250) * Health div 5000) * 50 + 250;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -2314 +2315 @@
             (1 shl trPeace or 1 shl TrFriendlyContact) <> 0 then
             AddFlags := AddFlags or fPeace;
-        end
+        end;
       end;
 
@@ -2363 +2364 @@
                 if (Loc1 >= 0) and (Loc1 < MapSize) then
                   Map[Loc1] := Map[Loc1] or fInEnemyZoC
-              end
+              end;
             end;
             if EnableContact and (mox.Domain = dGround) then
@@ -2437 +2438 @@
       Cardinal(Level) shl (2 * pTell);
   end;
-end; // DiscoverTile
+end;
 
 function Discover9(Loc, p, Level: integer;
@@ -2574 +2575 @@
           begin
             RW[pTell].EnemyCity[ecix].Loc := -1;
-            RW[pTell].Map[Loc] := RW[pTell].Map[Loc] and not fCity
+            RW[pTell].Map[Loc] := RW[pTell].Map[Loc] and not fCity;
           end;
         end;
@@ -2695 +2696 @@
           begin
             Tile1^ := Tile1^ or fInEnemyZoC;
-            Break
+            Break;
           end;
         end;
@@ -2725 +2726 @@
           Loc1 := Adjacent[V8];
           if (Loc1 >= 0) and (Loc1 < MapSize) then
-            RW[p].Map[Loc1] := RW[p].Map[Loc1] or fInEnemyZoC
+            RW[p].Map[Loc1] := RW[p].Map[Loc1] or fInEnemyZoC;
         end;
       end;
@@ -2944 +2945 @@
 {$IFOPT O-} if OriginLoc <> -2 then
     CheckBorders(-2); {$ENDIF} // check: single pass should do!
-end; // CheckBorders
+end;
 
 procedure LogCheckBorders(p, cix, PlayerLosingCity: integer);
@@ -2976 +2977 @@
       begin
         Fuel := Model[mix].Cap[mcFuel];
-        Flags := Flags or unBombsLoaded
+        Flags := Flags or unBombsLoaded;
       end;
       Job := jNone;
@@ -2999 +3000 @@
     Job := jNone;
     Flags := Flags and not(unFortified or unMountainDelay);
-    Loc0 := Loc
+    Loc0 := Loc;
   end;
   if Occupant[Loc0] >= 0 then
@@ -3014 +3015 @@
           begin
             ZoC := true;
-            Break
-          end
+            Break;
+          end;
         end;
     if not Occ then
@@ -3091 +3092 @@
       if Enemy >= 0 then
         CountLost(p, RW[p].Un[uix].mix, Enemy);
-      RW[p].Un[uix].Loc := -1
+      RW[p].Un[uix].Loc := -1;
     end;
   Occupant[Loc] := -1;
@@ -3141 +3142 @@
       (fTerrain or fSpecial or fRiver or nPl shl 27) or fCity;
 
-    ChangeTerritory(Loc, p)
+    ChangeTerritory(Loc, p);
   end;
 end;
@@ -3179 +3180 @@
               Distance(RW[p].City[nearest].Loc, Loc))) then
               nearest := cix1;
-          Home := nearest
+          Home := nearest;
         end
         else
@@ -3374 +3375 @@
           fPoll) or RealMap[Loc] and (fTerrain or fSpecial or fTerImp or
           fRoad or fRR or fCanal or fPoll);
-end; // CompleteJob
+end;
 
 {
@@ -3595 +3596 @@
         begin
           if execute then
-            GiveCivilReport(pTarget, pSender)
+            GiveCivilReport(pTarget, pSender);
         end
         else if RW[pSender].EnemyReport[pSubject].TurnOfCivilReport < 0 then
@@ -3610 +3611 @@
         begin
           if execute then
-            GiveMilReport(pTarget, pSender)
+            GiveMilReport(pTarget, pSender);
         end
         else if RW[pSender].EnemyReport[pSubject].TurnOfMilReport < 0 then
           result := false
         else if execute then
-          CopyMilReport(pSender, pTarget, pSubject)
+          CopyMilReport(pSender, pTarget, pSubject);
       end;
     opMap:
@@ -3628 +3629 @@
         begin // agreed treaty end
           if execute then
-            CancelTreaty(pSender, pTarget, false)
+            CancelTreaty(pSender, pTarget, false);
         end
         else
@@ -3732 +3733 @@
       begin
         if execute then
-          CopyModel(pSender, pTarget, Price - opModel)
+          CopyModel(pSender, pTarget, Price - opModel);
       end
       else
@@ -3747 +3748 @@
       result:=false
       end; }
-  end
+  end;
 end;
 
@@ -3895 +3896 @@
           begin // make p1 and p2 know each other
             if RW[p1].Treaty[p2] = trNoContact then
-              IntroduceEnemy(p1, p2)
+              IntroduceEnemy(p1, p2);
           end;
 
@@ -3941 +3942 @@
 var
   i, p1: integer;
-
 begin
   if Mode = moPlaying then
@@ -4032 +4032 @@
             DiscoverViewAreas(Player);
             DiscoverViewAreas(Subject);
-            Break
-          end
+            Break;
+          end;
       end;
 
     sIntSetDevModel:
       if Mode < moPlaying then
-        move(Data, RW[Player].DevModel.Kind, sIntSetDevModel and $F * 4);
+        Move(Data, RW[Player].DevModel.Kind, sIntSetDevModel and $F * 4);
 
     sIntSetModelStatus:
@@ -4071 +4071 @@
         RW[Player].EnemyCity[Subject].Status := integer(Data);
       end;
-
-  end; { case command }
-end; { IntServer }
+  end;
+end;
 
 end.

trunk/GameServer.pas

@@ -958 +958 @@
   if Mode >= moMovie then
     Notify(ntEndInfo);
-end; { StartGame }
+end;
 
 procedure EndGame;
@@ -1324 +1324 @@
   Inform(pTurn);
   ChangeClientWhenDone(cResume, 0, nil^, 0);
-end; // LoadGame
+end;
 
 procedure InsertTerritoryUpdateCommands;
@@ -1908 +1908 @@
   end;
   // CheckContact;
-end; { BeforeTurn }
+end;
 
 procedure AfterTurn;
@@ -2035 +2035 @@
           CheckWin(p1);
   end;
-end; // Afterturn
+end;
 
 procedure NextPlayer;
@@ -2289 +2289 @@
         end;
   end;
-end; // ExecuteMove
+end;
 
 function ExecuteAttack(p, uix, ToLoc: integer; var MoveInfo: TMoveInfo;
@@ -2559 +2559 @@
     end;
   end;
-end; // ExecuteAttack
+end;
 
 function MoveUnit(p, uix, dx, dy: integer; TestOnly: boolean): integer;
@@ -4490 +4490 @@
     LastEndClientCommand := Command;
 {$IFOPT O-}dec(nHandoverStack, 2); {$ENDIF}
-end; { <<<server }
+end;
 
 

trunk/IPQ.pas

@@ -8 +8 @@
 
 type
-
   TIntegerArray = array [0 .. $40000000 div sizeof(integer)] of integer;
   PIntegerArray = ^TIntegerArray;
@@ -158 +157 @@
     Ix[last.Item] := i;
   end;
-  result := True
+  result := True;
 end;
 

trunk/Inp.pas

@@ -26 +26 @@
 var
   InputDlg: TInputDlg;
+
 
 implementation

trunk/LocalPlayer/Battle.pas

@@ -200 +200 @@
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
   BitBltCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
-end; { PaintBattleOutcome }
+end;
 
 procedure TBattleDlg.FormCreate(Sender: TObject);

trunk/LocalPlayer/CityScreen.pas

@@ -1027 +1027 @@
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TCityDlg.FormShow(Sender: TObject);
@@ -1408 +1408 @@
       end;
     end;
-end; { FormMouseDown }
+end;
 
 procedure TCityDlg.ChooseProject;

trunk/LocalPlayer/CityType.pas

@@ -189 +189 @@
   end;
   MarkUsedOffscreen(InnerWidth, InnerHeight);
-end; { MainPaint }
+end;
 
 procedure TCityTypeDlg.LoadType(NewType: integer);

trunk/LocalPlayer/ClientTools.pas

@@ -316 +316 @@
     UnitInfo := MyRO.EnemyUn[uix];
   end;
-end; { GetUnitInfo }
+end;
 
 procedure GetCityInfo(Loc: integer; var cix: integer; var CityInfo: TCityInfo);
@@ -756 +756 @@
 initialization
 
-  Assert(nImp < 128);
-  CalculateAdvValues;
+Assert(nImp < 128);
+CalculateAdvValues;
 
 end.

trunk/LocalPlayer/Diagram.pas

@@ -273 +273 @@
     end;
   MarkUsedOffscreen(InnerWidth, InnerHeight);
-end; // OffscreenPaint
+end;
 
 procedure TDiaDlg.FormPaint(Sender: TObject);

trunk/LocalPlayer/Draft.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin,
-
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonA,
-  ButtonB, Area;
+  Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA, ButtonB, Area;
 
 type

trunk/LocalPlayer/Enhance.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
-
-  SysUtils, Classes, Graphics, Controls, Forms, IsoEngine,
-  ButtonB, ButtonC, Menus;
+  ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, IsoEngine, ButtonB, ButtonC, Menus;
 
 type
@@ -299 +297 @@
 
   MarkUsedOffscreen(InnerWidth, InnerHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TEnhanceDlg.CloseBtnClick(Sender: TObject);

trunk/LocalPlayer/IsoEngine.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, ScreenTools, Tribes,
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, UPixelPointer, UGraphicSet;
+  Protocol, ClientTools, ScreenTools, Tribes, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, UPixelPointer, UGraphicSet;
 
 const
@@ -719 +719 @@
       end;
     end;
-end; { PaintUnit }
+end;
 
 procedure TIsoMap.PaintCity(x, y: integer; const CityInfo: TCityInfo;
@@ -804 +804 @@
     Textout(xShield + 2, yShield - 1, LabelTextColor, s);
   end;
-end; { PaintCity }
+end;
 
 function PoleTile(Loc: integer): integer;
@@ -1300 +1300 @@
       Textout(x + xxt - 16, y + yyt - 9, $00E0FF,
         IntToStr(integer(DebugMap[Loc])))
-end; { PaintTileObjects }
+end;
 
 procedure TIsoMap.PaintGrid(x, y, nx, ny: integer);
@@ -1687 +1687 @@
 
   // frame(FOutput.Canvas,x+1,y+1,x+nx*33+33-2,y+ny*16+32-2,$FFFF,$FFFF);
-end; { Paint }
+end;
 
 procedure TIsoMap.AttackBegin(const ShowMove: TShowMove);

trunk/LocalPlayer/MessgEx.pas

@@ -5 +5 @@
 
 uses
-  Messg, Protocol, ScreenTools, Platform, DateUtils,
-  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
-  ButtonB, StdCtrls, DrawDlg;
+  Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
+  SysUtils, Classes, Graphics, Controls, Forms, ButtonA, ButtonB, StdCtrls,
+  DrawDlg;
 
 type

trunk/LocalPlayer/NatStat.pas

@@ -48 +48 @@
   NatStatDlg: TNatStatDlg;
 
+
 implementation
 
@@ -394 +395 @@
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TNatStatDlg.CloseBtnClick(Sender: TObject);

trunk/LocalPlayer/Nego.pas

@@ -96 +96 @@
   NegoDlg: TNegoDlg;
 
+
 implementation
 
@@ -476 +477 @@
                 (ButtonPrice[Tag and $FF] shr 24 in MyAllowed);
               Lit := Delivers[Tag and $FF] <> $FFFFFFFF;
-            end
+            end;
         end;
 end;
@@ -630 +631 @@
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TNegoDlg.Initiate;
@@ -784 +785 @@
           if a > MaxShipPartPrice then
             a := MaxShipPartPrice;
-          inc(Price, a)
+          inc(Price, a);
         end;
       opAllTech:
@@ -843 +844 @@
     begin
       SimpleMessage(Phrases.Lookup('MAX2OFFERS'));
-      exit
+      exit;
     end;
     Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
@@ -886 +887 @@
           if a > MaxShipPartPrice then
             a := MaxShipPartPrice;
-          inc(Price, a)
+          inc(Price, a);
         end;
       opAllTech:
@@ -906 +907 @@
             Price := opAllModel
           else
-            Price := OpModel + ModalSelectDlg.result
+            Price := OpModel + ModalSelectDlg.result;
         end;
       opTreaty:

trunk/LocalPlayer/PVSB.pas

@@ -5 +5 @@
 
 uses
-  {$IFDEF WINDOWS}
-  Windows,
-  {$ENDIF}
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
   Classes, Controls, Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils,
   StdCtrls, Math;

trunk/LocalPlayer/Rates.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
-
-  SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC;
+  Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonB, ButtonC;
 
 type
@@ -28 +26 @@
 var
   RatesDlg: TRatesDlg;
+
 
 implementation

trunk/LocalPlayer/Select.pas

@@ -1519 +1519 @@
       Lines[2] := 0;
     end;
-end; // InitLines
+end;
 
 function TListDlg.OnlyChoice(TestKind: TListKind): integer;

trunk/LocalPlayer/Term.pas

@@ -2082 +2082 @@
             s := Tribe[me].TPhrase('AGE0');
             MessgText :=
-              Format(s, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)])
+              Format(s, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)]);
           end
           else
@@ -2088 +2088 @@
             s := Tribe[me].TString(Phrases2.Lookup('AGE0'));
             MessgText := Format(s, [TurnToString(MyRO.Turn)]);
-          end
+          end;
         end
         else
@@ -8302 +8302 @@
 end;
 
-initialization
-
 end.
 

trunk/LocalPlayer/UnitStat.pas

@@ -695 +695 @@
     (ClientWidth - BiColorTextWidth(offscreen.Canvas, Caption)) div 2,
     yCaption, Caption);
-end; { OffscreenPaint }
+end;
 
 procedure TUnitStatDlg.ModelBoxChange(Sender: TObject);

trunk/LocalPlayer/Wonders.pas

@@ -281 +281 @@
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TWondersDlg.CloseBtnClick(Sender: TObject);

trunk/Log.pas

@@ -110 +110 @@
         s := s + Tribe[SlotNo[Y, X]].TPhrase('SHORTNAME') + ' | ';
       end;
-    List.Lines.Add(s)
+    List.Lines.Add(s);
   end;
   PostMessage(List.Handle, WM_VSCROLL, SB_BOTTOM, 0);

trunk/NoTerm.pas

@@ -52 +52 @@
 procedure Client(Command, Player: integer; var Data); stdcall;
 
+
 implementation
 
 uses
-  GameServer, log;
+  GameServer, Log;
 
 {$R *.lfm}

trunk/Packages/CevoComponents/BaseWin.pas

@@ -513 +513 @@
 MainFormKeyDown := nil;
 
-finalization
-
 end.

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -1644 +1644 @@
 
 procedure Gtk2Fix;
+{$IFDEF UNIX}
 var
   I: Integer;
+{$ENDIF}
 begin
   {$IFDEF UNIX}

trunk/Platform.pas

@@ -9 +9 @@
 
 function NowPrecise: TDateTime;
+
 
 implementation

trunk/Start.pas

@@ -1928 +1928 @@
 end;
 
-
 end.

trunk/UBrain.pas

@@ -204 +204 @@
 end;
 
-
 end.
 

trunk/UMiniMap.pas

@@ -328 +328 @@
 end;
 
-
 end.
 

trunk/UnitProcessing.pas

@@ -43 +43 @@
 procedure InitGame;
 procedure ReleaseGame;
+
 
 implementation
@@ -132 +133 @@
         begin // p observes tile
           result := coKnown or coTrue;
-          exit
+          exit;
         end
         else
           result := coTrue; // p does not observe tile
     end;
-  end
+  end;
 end;
 
@@ -187 +188 @@
                   MoveCost := Speed;
                   result := eMountains;
-                  exit
+                  exit;
                 end;
             end;
@@ -207 +208 @@
       dAir:
         MoveCost := 50 * MoveLength; { always valid move }
-    end
-  end
+    end;
+  end;
 end;
 
@@ -266 +267 @@
         begin
           result := eTreaty;
-          exit
+          exit;
         end; // keep peace treaty!
       end;
@@ -280 +281 @@
           begin
             result := eNoCapturer;
-            exit
+            exit;
           end;
           MoveInfo.MoveType := mtCapture;
@@ -289 +290 @@
           begin
             result := eDomainMismatch;
-            exit
+            exit;
           end
           else if (PModel.Attack = 0) and
@@ -296 +297 @@
           begin
             result := eNoBombarder;
-            exit
+            exit;
           end
           else if Movement < 100 then
           begin
             result := eNoTime_Bombard;
-            exit
+            exit;
           end;
           MoveInfo.MoveType := mtBombard;
           result := eBombarded;
-        end
+        end;
     end;
 
@@ -328 +329 @@
         MoveInfo.EndHealth := BattleForecast.EndHealthAtt;
         MoveInfo.EndHealthDef := BattleForecast.EndHealthDef;
-      end
+      end;
     end
     else // if MoveInfo.MoveType in [mtMove,mtCapture,mtSpyMission] then
@@ -382 +383 @@
               then
                 Break;
-            end
+            end;
       end;
       if result < rExecuted then
@@ -401 +402 @@
         begin
           result := eZOC;
-          exit
+          exit;
         end
         else if not TestOnly and (DestControlled >= coTrue) then
         begin
           result := eZOC_EnemySpotted;
-          exit
-        end
+          exit;
+        end;
       end;
       if (Movement = 0) and (ServerVersion[p] >= $0100F1) or
@@ -414 +415 @@
         begin
           result := eNoTime_Load;
-          exit
+          exit;
         end
         else
         begin
           result := eNoTime_Move;
-          exit
+          exit;
         end;
       if (MoveInfo.EndHealth <= 0) or (MoveInfo.MoveType = mtSpyMission) then
@@ -433 +434 @@
       MoveInfo.Defender := RealMap[ToLoc] shr 27;
       SearchCity(ToLoc, MoveInfo.Defender, MoveInfo.Dcix);
-    end
-  end
-end; // CalculateMove
+    end;
+  end;
+end;
 
 function GetBattleForecast(Loc: integer; var BattleForecast: TBattleForecast;
@@ -449 +450 @@
     begin
       result := eOK;
-      exit
+      exit;
     end; // no attack, simple move
 
@@ -459 +460 @@
       EndHealthDef := RW[Defender].Un[Duix].Health;
       result := eOK;
-      exit
+      exit;
     end;
 
@@ -482 +483 @@
       begin
         result := eDomainMismatch;
-        exit
+        exit;
       end; // can't attack plane
     end;
@@ -492 +493 @@
     begin
       result := eDomainMismatch;
-      exit
+      exit;
     end;
     if (PModel.Attack = 0) and not((PModel.Cap[mcBombs] > 0) and
@@ -498 +499 @@
     begin
       result := eInvalid;
-      exit
+      exit;
     end;
 
@@ -504 +505 @@
     begin
       result := eNoTime_Attack;
-      exit
+      exit;
     end;
 
@@ -577 +578 @@
         DBaseDamage := 1;
       if DBaseDamage > RW[Defender].Un[Duix].Health then
-        DBaseDamage := RW[Defender].Un[Duix].Health
+        DBaseDamage := RW[Defender].Un[Duix].Health;
     end;
 
@@ -589 +590 @@
         ABaseDamage := 1;
       if ABaseDamage > HealthAtt then
-        ABaseDamage := HealthAtt
+        ABaseDamage := HealthAtt;
     end;
 
@@ -625 +626 @@
       result := eWon
     else
-      result := eBloody
-  end
-end; // GetBattleForecast
+      result := eBloody;
+  end;
+end;
 
 function LoadUnit(p, uix: integer; TestOnly: boolean): integer;
@@ -654 +655 @@
               begin
                 ToMaster := uix1;
-                Break
+                Break;
               end
               else if ToMaster < 0 then
@@ -679 +680 @@
           Master := ToMaster;
           UpdateUnitMap(Loc);
-        end
-      end
-    end
-  end
+        end;
+      end;
+    end;
+  end;
 end;
 
@@ -721 +722 @@
         UpdateUnitMap(Loc);
       end;
-    end
+    end;
 end;
 
@@ -802 +803 @@
   begin
     result := eInvalid;
-    exit
+    exit;
   end;
   if (a.ToLoc <> maNextCity) and (Map[a.ToLoc] and fTerrain = fUNKNOWN) then
   begin
     result := eNoWay;
-    exit
+    exit;
   end;
 
@@ -816 +817 @@
         begin
           result := eDomainMismatch;
-          exit
+          exit;
         end
         else
@@ -843 +844 @@
         begin
           result := eDomainMismatch;
-          exit
+          exit;
         end
         else
@@ -859 +860 @@
           maxmov := Speed;
           initmov := 0;
-        end
+        end;
     end;
 
@@ -873 +874 @@
     begin
       Loc := -1;
-      Break
+      Break;
     end;
     FromTile := Map[Loc];
@@ -1029 +1030 @@
                 From[Loc1] := Loc;
                 Damage[Loc1] := Damage[Loc] + AddDamage;
-              end
-          end
-        end
-      end
-    end
+              end;
+          end;
+        end;
+      end;
+    end;
   end;
   FreeAndNil(Q);
@@ -1074 +1075 @@
 
   // QueryPerformanceCounter(tt);{time in s is: (tt-tt0)/PerfFreq}
-end; // GetMoveAdvice
+end;
 
 function CanPlaneReturn(p, uix: integer;
@@ -1129 +1130 @@
     begin
       result := false;
-      Break
+      Break;
     end;
     if MapFlags[Loc] and mfEnd <> 0 then
     begin
       result := true;
-      Break
+      Break;
     end;
     FromTile := Map[Loc];
@@ -1161 +1162 @@
             T1 := T + MoveCost shl 8;
           Q.Put(Loc1, T1);
-        end
-      end
-    end
+        end;
+      end;
+    end;
   end;
   FreeAndNil(Q);
-end; // CanPlaneReturn
+end;
 
 {
@@ -1195 +1196 @@
               inc(JobWork, RoadBridgeWork) { across river }
             else
-              result := eNoBridgeBuilding
+              result := eNoBridgeBuilding;
         end
         else
@@ -1223 +1224 @@
           if (IrrEff = 0) or (RealMap[Loc] and fTerImp = tiIrrigation) or
             (RealMap[Loc] and fTerImp = tiFarm) then
-            result := eInvalid
+            result := eInvalid;
         end;
       jFarm:
@@ -1232 +1233 @@
           JobWork := IrrClearWork * FarmWork;
           if (JobWork <= 0) or (RealMap[Loc] and fTerImp = tiFarm) then
-            result := eInvalid
+            result := eInvalid;
         end;
       jAfforest:
@@ -1243 +1244 @@
           JobWork := MineAfforestWork;
           if (MineEff = 0) or (RealMap[Loc] and fTerImp = tiMine) then
-            result := eInvalid
+            result := eInvalid;
         end;
       jFort:
@@ -1260 +1261 @@
           JobWork := TransWork;
           if JobWork <= 0 then
-            result := eInvalid
+            result := eInvalid;
         end;
       jPoll:
@@ -1278 +1279 @@
           result := eInvalid;
     end;
-end; // CalculateJobWork
+end;
 
 function StartJob(p, uix, NewJob: integer; TestOnly: boolean): integer;
@@ -1291 +1292 @@
     begin
       result := eNotChanged;
-      exit
+      exit;
     end;
     if NewJob = jNone then
@@ -1297 +1298 @@
       if not TestOnly then
         Job := jNone;
-      exit
+      exit;
     end;
     Loc0 := Loc;
@@ -1304 +1305 @@
     begin
       result := eDeadLands;
-      exit
+      exit;
     end;
     TerrType := RealMap[Loc0] and fTerrain;
@@ -1314 +1315 @@
     begin
       result := eInvalid;
-      exit
+      exit;
     end;
     if (JobPreq[NewJob] <> preNone) and
@@ -1320 +1321 @@
     begin
       result := eNoPreq;
-      exit
+      exit;
     end;
 
@@ -1347 +1348 @@
     begin
       RemoveUnit_UpdateMap(p, uix);
-      result := eCity
+      result := eCity;
     end
     else if Health <= 0 then
@@ -1361 +1362 @@
         Discover21(Loc0, p, lObserveUnhidden, true, true);
         // CheckContact;
-      end
-    end
-  end; // with
-end; // StartJob
+      end;
+    end;
+  end;
+end;
 
 function Work(p, uix: integer): boolean;
@@ -1422 +1423 @@
         end
     end
-end; // work
+end;
 
 function GetJobProgress(p, Loc: integer;
@@ -1438 +1439 @@
       else
         JobProgressData[Job].Done := JobProgressData[Job].Required -
-          ToWork[Loc, Job]
+          ToWork[Loc, Job];
     end
     else