Changeset 425 for trunk

Timestamp:

Apr 26, 2022, 7:34:12 PM (3 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• CityProcessing.pas (modified) (43 diffs)
• GameServer.pas (modified) (2 diffs)
• LocalPlayer/MessgEx.pas (modified) (4 diffs)
• LocalPlayer/Term.pas (modified) (3 diffs)

trunk/CityProcessing.pas

@@ -34 +34 @@
 procedure ReleaseGame;
 
+
 implementation
 
 type
   TTradeProcessing = record
-    TaxBonus, LuxBonus, ScienceBonus, FutResBonus, ScienceDoubling,
-      HappyBase: integer;
-    RelCorr: single;
-    FlexibleLuxury: boolean;
+    TaxBonus: Integer;
+    LuxBonus: Integer;
+    ScienceBonus: Integer;
+    FutResBonus: Integer;
+    ScienceDoubling: Integer;
+    HappyBase: Integer;
+    RelCorr: Single;
+    FlexibleLuxury: Boolean;
   end;
 
   TProdProcessing = record
-    ProdBonus, PollBonus, FutProdBonus, PollThreshold: integer;
+    ProdBonus: Integer;
+    PollBonus: Integer;
+    FutProdBonus: Integer;
+    PollThreshold: Integer;
   end;
 
@@ -51 +59 @@
 
   TCityReportEx = record
-    BaseHappiness, BaseControl, Material: integer;
+    BaseHappiness: Integer;
+    BaseControl: Integer;
+    Material: Integer;
     ProdProcessing: TProdProcessing;
     TradeProcessing: TTradeProcessing;
@@ -59 +69 @@
   MaxDist: integer;
 
-  {
-    Reporting
-    ____________________________________________________________________
-  }
+{
+  Reporting
+  ____________________________________________________________________
+}
 procedure GetCityAreaInfo(p, Loc: integer; var CityAreaInfo: TCityAreaInfo);
 var
@@ -88 +98 @@
           Available[V21] := faNotAvailable
         else
-          Available[V21] := faAvailable
-      end
-    end;
-  end
+          Available[V21] := faAvailable;
+      end;
+    end;
+  end;
 end;
 
@@ -224 +234 @@
       RelCorr := 1.0;
     HappyBase := Size + HappinessBeforeLux;
-  end
+  end;
 end;
 
@@ -280 +290 @@
         result := result - 3 * i;
         if result <= 0 then
-          result := i
+          result := i;
       end
       else if RW[p].Model[Project and cpIndex].Cap[mcLine] > 0 then
@@ -287 +297 @@
           result := result shr 1
         else
-          result := result * 2
+          result := result * 2;
     end
     else
@@ -297 +307 @@
     end;
     result := result * BuildCostMod[Difficulty[p]] div 12;
-  end
+  end;
 end;
 
@@ -330 +340 @@
       begin
         Happy := Size;
-        Control := Size
+        Control := Size;
       end // !!! old bug, kept for compatibility
       else
       begin
         Happy := 0;
-        Control := 0
+        Control := 0;
       end;
 
@@ -374 +384 @@
         begin
           inc(Happy);
-          inc(BaseHappiness, 2)
+          inc(BaseHappiness, 2);
         end;
       if Built[imTemple] = 1 then
       begin
         inc(Happy);
-        inc(BaseHappiness, 2)
+        inc(BaseHappiness, 2);
       end;
       if Built[imCathedral] = 1 then
@@ -388 +398 @@
         begin
           inc(Happy);
-          inc(BaseHappiness, 2)
+          inc(BaseHappiness, 2);
         end;
       end;
@@ -394 +404 @@
       begin
         inc(Happy, 2);
-        inc(BaseHappiness, 4)
+        inc(BaseHappiness, 4);
       end;
 
@@ -433 +443 @@
             begin
               inc(Happy);
-              inc(Control, 2)
+              inc(Control, 2);
             end;
         gFundamentalism:
@@ -439 +449 @@
             BaseHappiness := 0; // done by control
             Happy := Size;
-            Control := Size
+            Control := Size;
           end;
       end;
@@ -463 +473 @@
           begin
             result := eInvalid;
-            exit
+            exit;
           end;
           GetTileInfo(p, cix, Loc1, TileInfo);
@@ -472 +482 @@
             (RW[p].Tech[adMassProduction] >= tsApplicable) then
             inc(RareOK[RealMap[Loc1] shr 25 and 3]);
-          inc(Working)
+          inc(Working);
         end;
       if Built[imAlgae] = 1 then
@@ -501 +511 @@
   end;
   result := eOk;
-end; { GetSmallCityReport }
+end;
 
 function GetCityReport(p, cix: integer; var CityReport: TCityReport): integer;
@@ -582 +592 @@
             SelectedLoc := Loc1;
             SelectedV21 := V21;
-            Most := Resources
-          end
-        end
-      end
+            Most := Resources;
+          end;
+        end;
+      end;
     end;
   end;
@@ -617 +627 @@
             SelectedLoc := Loc1;
             SelectedV21 := V21;
-            Least := Resources
-          end
-        end;
-      end
-  end
+            Least := Resources;
+          end;
+        end;
+      end;
+  end;
 end;
 
@@ -680 +690 @@
       assert(1 shl V21 and Tiles = 0);
       Tiles := Tiles or (1 shl V21);
-      UsedByCity[TileLoc] := Loc
-    end
+      UsedByCity[TileLoc] := Loc;
+    end;
 end;
 
@@ -704 +714 @@
         assert(1 shl V21 and Tiles = 0);
         Tiles := Tiles or (1 shl V21);
-        UsedByCity[TileLoc] := Loc
-      end
-    end;
-  end
+        UsedByCity[TileLoc] := Loc;
+      end;
+    end;
+  end;
 end;
 
@@ -729 +739 @@
       assert(1 shl V21 and Tiles <> 0);
       Tiles := Tiles and not(1 shl V21);
-      UsedByCity[TileLoc] := -1
+      UsedByCity[TileLoc] := -1;
     end
     else { test whether exploitation of tile would lead to disorder }
@@ -742 +752 @@
         assert(1 shl V21 and Tiles <> 0);
         Tiles := Tiles and not(1 shl V21);
-        UsedByCity[TileLoc] := -1
-      end
-    end;
-  end
+        UsedByCity[TileLoc] := -1;
+      end;
+    end;
+  end;
 end;
 
@@ -760 +770 @@
       inc(Flags, chPollution);
       RealMap[PollutionLoc] := RealMap[PollutionLoc] or fPoll;
-    end
+    end;
   end;
 end;
@@ -790 +800 @@
               GrWallContinent[p] := -1;
           end;
-          inc(Flags, chImprovementLost)
-        end
+          inc(Flags, chImprovementLost);
+        end;
       end;
 end;
@@ -846 +856 @@
       begin
         inc(Money, Prod - CityProjectCost);
-        Prod := CityProjectCost
+        Prod := CityProjectCost;
       end;
       if Production < 0 then
@@ -888 +898 @@
     begin
       if CanCityGrow(p, cix) then
-        inc(SizeMod)
+        inc(SizeMod);
     end
     else if CheckGrow and (Food >= CityStorage) then { normal growth }
@@ -898 +908 @@
         else
           dec(Food, CityStorage);
-        inc(SizeMod)
-      end
+        inc(SizeMod);
+      end;
     end
     else if Food < 0 then { famine }
@@ -924 +934 @@
       begin
         dec(SizeMod);
-        inc(Flags, chPopDecrease)
+        inc(Flags, chPopDecrease);
       end
     end;
@@ -954 +964 @@
               begin
                 uix := i;
-                Det := TestDet
+                Det := TestDet;
               end;
             end;
@@ -961 +971 @@
           RemoveUnit_UpdateMap(p, uix);
           inc(Flags, chUnitLost);
-        end
-      end
+        end;
+      end;
     end;
 
@@ -1008 +1018 @@
               Exp := ExpCost * 2; { vet }
             if Project and cpConscripts <> 0 then
-              Flags := Flags or unConscripts
+              Flags := Flags or unConscripts;
           end;
           PlaceUnit(p, nUn - 1);
@@ -1065 +1075 @@
                       if (City[cix2].Loc >= 0) and (City[cix2].Built[i] = 1)
                       then
-                        GWonder[i].EffectiveOwner := p
+                        GWonder[i].EffectiveOwner := p;
               end;
             woLighthouse:
@@ -1085 +1095 @@
                       IntroduceEnemy(p, p1);
                     GiveCivilReport(p, p1);
-                    GiveMilReport(p, p1)
+                    GiveMilReport(p, p1);
                   end;
-              end
+              end;
           end;
         end;
@@ -1113 +1123 @@
       end;
       Prod0 := Prod;
-      inc(Flags, chProduction)
+      inc(Flags, chProduction);
     end
     else
@@ -1133 +1143 @@
       begin
         CityShrink(p, cix);
-        inc(SizeMod)
-      end;
-  end
-end; // CityTurn
+        inc(SizeMod);
+      end;
+  end;
+end;
 
 {
@@ -1179 +1189 @@
             begin
               result := eTileNotAvailable;
-              exit
+              exit;
             end;
         // not more tiles than inhabitants
@@ -1189 +1199 @@
         begin
           result := eNoWorkerAvailable;
-          exit
+          exit;
         end;
       end;
@@ -1208 +1218 @@
             // should only happen during loading, because of wrong sSetCityTiles command order
           else
-            UsedByCity[Loc1] := -1 // unemploy tile
-        end;
-      Tiles := NewTiles
-    end
+            UsedByCity[Loc1] := -1; // unemploy tile
+        end;
+      Tiles := NewTiles;
+    end;
   end;
 end;
@@ -1223 +1233 @@
 type
   TTileData = record
-    Food, Prod, Trade, SubValue, V21: integer;
+    Food: Integer;
+    Prod: Integer;
+    Trade: Integer;
+    SubValue: Integer;
+    V21: Integer;
   end;
 var
@@ -1364 +1378 @@
           (RealMap[Loc1] and fModern = cardinal(NeedRare)) then
           RareTiles := RareTiles or (1 shl V21);
-      end
+      end;
     end;
 
@@ -1654 +1668 @@
                   TestReport.Lux shr 1;
                 Advice.CityReport := TestReport;
-              end
-            end // if (SuperPlus>0) or (ValuePlus>=0.0)
-          end // if SuperPlus>=0
-        end
+              end;
+            end; // if (SuperPlus>0) or (ValuePlus>=0.0)
+          end; // if SuperPlus>=0
+        end;
       end;
 
@@ -1691 +1705 @@
   Advice.Tiles := BestTiles;
   Advice.CityReport.HypoTiles := BestTiles;
-end; // GetCityTileAdvice
+end;
 
 {

trunk/GameServer.pas

@@ -815 +815 @@
         begin
           Data := nil;
-          SavedData[p] := nil
+          SavedData[p] := nil;
         end;
         nBattleHistory := 0;
@@ -836 +836 @@
           RW[p].DefaultDebugMap := nil;
 
-        { !!!for i:=0 to nShipPart-1 do GShip[p].Parts[i]:=Delphirandom((3-i)*2);{ }
+        { !!!for i:=0 to nShipPart-1 do GShip[p].Parts[i]:=Delphirandom((3-i)*2); }
       end;
 

trunk/LocalPlayer/MessgEx.pas

@@ -13 +13 @@
     mikPureIcon, mikMyArmy, mikEnemyArmy, mikFullControl, mikShip, mikBigIcon,
     mikEnemyShipComplete);
+
+  { TMessgExDlg }
 
   TMessgExDlg = class(TBaseMessgDlg)
@@ -57 +59 @@
   ContextKind, ContextNo: integer);
 
+
 implementation
 
@@ -220 +223 @@
   wScrewed = 43;
   hScrewed = 27;
+type
+  TScrewed = array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of Single;
 var
   ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: integer;
   BookRect: TRect;
   x1, xR, yR, share: single;
-  Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
+  Screwed: TScrewed;
   SrcPtr: TPixelPointer;
   Width: Integer;
@@ -235 +240 @@
     yIcon := (IconIndex + SystemIconLines * 7) div 7 * ySizeBig;
     // prepare screwed icon
-    FillChar(Screwed, sizeof(Screwed), 0);
+    Screwed := Default(TScrewed);
     BigImp.BeginUpdate;
     SrcPtr := PixelPointer(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));

trunk/LocalPlayer/Term.pas

@@ -383 +383 @@
     procedure PaintZoomedTile(dst: TBitmap; x, y, Loc: integer);
   public
-    UsedOffscreenWidth, UsedOffscreenHeight: integer;
+    UsedOffscreenWidth: Integer;
+    UsedOffscreenHeight: Integer;
     Offscreen: TBitmap;
     OffscreenUser: TForm;
@@ -2843 +2844 @@
                 ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas,
                 0, 0);
-          end
-        end
+          end;
+        end;
       end;
 
@@ -7701 +7702 @@
 procedure TMainScreen.Toggle(Sender: TObject);
 begin
-  TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked
+  TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked;
 end;