Changeset 414

Timestamp:

Nov 17, 2021, 1:18:21 AM (3 years ago)

Author:

chronos

Message:

• Modified: Merged duplicated code into ApplyToVisibleForms method.
• Modified: Code cleanup.

Location:

trunk

Files:

• GameServer.pas (modified) (2 diffs)
• LocalPlayer/NatStat.pas (modified) (13 diffs)
• LocalPlayer/Term.pas (modified) (28 diffs)

trunk/GameServer.pas

@@ -3614 +3614 @@
             then
               RW[p1].EnemyReport[Player].Government := Subject;
-        end
+        end;
       end;
 
@@ -3629 +3629 @@
           RW[Player].TaxRate := Subject and $F * 10;
           RW[Player].LuxRate := Subject shr 4 * 10;
-        end
+        end;
       end;
 

trunk/LocalPlayer/NatStat.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin,
-
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC, Menus, EOTButton;
+  Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, Menus, EOTButton;
 
 type
@@ -32 +30 @@
     procedure ScrollDownBtnClick(Sender: TObject);
     procedure TellAIBtnClick(Sender: TObject);
-
   public
     procedure CheckAge;
     procedure ShowNewContent(NewMode: integer; p: integer = -1);
     procedure EcoChange;
-
   protected
     procedure OffscreenPaint; override;
-
   private
     pView, AgePrepared, LinesDown: integer;
@@ -305 +300 @@
           Phrases.Lookup('FREXTINCT'));
         LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 28,
-          TurnToString(CurrentReport.TurnOfCivilReport))
+          TurnToString(CurrentReport.TurnOfCivilReport));
       end
       else
@@ -320 +315 @@
         s := Phrases.Lookup('FRNOCONTACT');
         LoweredTextOut(Canvas, -1, MainTexture,
-          (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, yRelation + 9, s)
+          (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, yRelation + 9, s);
       end
       else if ShowContact then
@@ -379 +374 @@
           end;
           inc(y);
-        end
+        end;
       end;
     end
@@ -403 +398 @@
 procedure TNatStatDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -421 +416 @@
       begin
         if MainScreen.ContactRefused(pView, 'FRANARCHY') then
-          SmartUpdateContent
+          SmartUpdateContent;
       end
       else
@@ -427 +422 @@
   end
   else
-    Close
+    Close;
 end;
 
@@ -501 +496 @@
   end
   else
-    inherited
+    inherited;
 end;
 
@@ -510 +505 @@
     SelfReport.Government := MyRO.Government;
     SelfReport.Money := MyRO.Money;
-    SmartUpdateContent
-  end
+    SmartUpdateContent;
+  end;
 end;
 
@@ -520 +515 @@
     dec(LinesDown);
     SmartUpdateContent;
-  end
+  end;
 end;
 
@@ -529 +524 @@
     inc(LinesDown);
     SmartUpdateContent;
-  end
+  end;
 end;
 
@@ -540 +535 @@
   else
     TellAIBtn.ButtonIndex := 2;
-  SmartUpdateContent
+  SmartUpdateContent;
 end;
 

trunk/LocalPlayer/Term.pas

@@ -368 +368 @@
 
   TPriceSet = set of $00 .. $FF;
+  TFormAction = (faClose, faEnable, faDisable, faUpdate, faSmartUpdateContent);
 
 const
@@ -536 +537 @@
   lxmax_xxx = 130;
   LeftPanelWidth = 70;
-  LeftPanelWidth_Editor = 46;
   overlap = PanelHeight - MidPanelHeight;
   yTroop = PanelHeight - 83;
   xPalace = 66;
   yPalace = 24; // 120;
-  xAdvisor = 108;
-  yAdvisor = 48;
+{  xAdvisor = 108;
+  yAdvisor = 48;}
   xUnitText = 80;
-  PaperShade = 3;
   BlinkOnTime = 12;
   BlinkOffTime = 6;
@@ -1096 +1095 @@
           ChosenResearch := ModalSelectDlg.result;
           // can be researched immediately
-          MyData.FarTech := adNone
+          MyData.FarTech := adNone;
         end;
     end;
@@ -1106 +1105 @@
   ListDlg.TechChange;
   result := true;
+end;
+
+procedure ApplyToVisibleForms(FormAction: TFormAction);
+var
+  I: Integer;
+  Form: TForm;
+begin
+  for I := 0 to Screen.FormCount - 1 do begin
+    Form := Screen.Forms[I];
+    if Form.Visible and (Form is TBufferedDrawDlg) then begin
+      case FormAction of
+        faClose: Form.Close;
+        faEnable: Form.Enabled := True;
+        faDisable: Form.Enabled := False;
+        faUpdate: begin
+          if @Form.OnShow <> nil then Form.OnShow(nil);
+            Form.Invalidate;
+            Form.Update;
+        end;
+        faSmartUpdateContent: TBufferedDrawDlg(Form).SmartUpdateContent(False);
+      end;
+    end;
+  end;
 end;
 
@@ -1149 +1171 @@
     if G.RO[DipMem[me].pContact] <> nil then
     begin // close windows for next player
-      for i := 0 to Screen.FormCount - 1 do
-        if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
-        then
-          Screen.Forms[i].Close;
+      ApplyToVisibleForms(faClose);
     end
     else
@@ -1165 +1184 @@
 
 function TMainScreen.OfferCall(var Offer: TOffer): integer;
-var
-  i: integer;
 begin
   result := Server(scDipOffer, me, 0, Offer);
@@ -1177 +1194 @@
     if G.RO[DipMem[me].pContact] <> nil then
     begin // close windows for next player
-      for i := 0 to Screen.FormCount - 1 do
-        if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
-        then
-          Screen.Forms[i].Close;
+      ApplyToVisibleForms(faClose);
     end
     else
@@ -1851 +1865 @@
       begin
         NewAgeCenterTo := -1;
-        Loc1 := dLoc(Loc1, -dx, -dy)
+        Loc1 := dLoc(Loc1, -dx, -dy);
       end
       else
@@ -1859 +1873 @@
       end
     end;
-    Centre(Loc1)
-  end;
-
-  for i := 0 to Screen.FormCount - 1 do
-    if Screen.Forms[i] is TBufferedDrawDlg then
-      Screen.Forms[i].Enabled := true;
+    Centre(Loc1);
+  end;
+
+  ApplyToVisibleForms(faEnable);
 
   if ClientMode <> cResume then
@@ -1875 +1887 @@
     // first turn after anarchy -- don't show despotism palace!
     Update;
-    for i := 0 to Screen.FormCount - 1 do
-      if (Screen.Forms[i].Visible) and (Screen.Forms[i] is TBufferedDrawDlg)
-      then
-      begin
-        if @Screen.Forms[i].OnShow <> nil then
-          Screen.Forms[i].OnShow(nil);
-        Screen.Forms[i].Invalidate;
-        Screen.Forms[i].Update;
-      end;
+    ApplyToVisibleForms(faUpdate);
 
     if MyRO.Happened and phGameEnd <> 0 then
@@ -2708 +2712 @@
         SaveSettings;
         CityDlg.CloseAction := None;
-        for i := 0 to Screen.FormCount - 1 do
-          if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg)
-          then
-            Screen.Forms[i].Close;
+        ApplyToVisibleForms(faClose);
         if LogDlg.Visible then
           LogDlg.Close;
@@ -3759 +3760 @@
 
 var
-  i, p1, uix, cix, CenterLoc: integer;
+  p1, uix, cix, CenterLoc: integer;
   MsgItem: string;
   CityReport: TCityReport;
@@ -3767 +3768 @@
   result := false;
   if ClientMode >= scDipOffer then
-    exit;
-
-  if supervising and (me <> 0) then
-  begin
-    for i := 0 to Screen.FormCount - 1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close; // close windows
+    Exit;
+
+  if supervising and (me <> 0) then begin
+    ApplyToVisibleForms(faClose);
     ItsMeAgain(0);
   end;
@@ -3915 +3913 @@
 
   CityDlg.CloseAction := None;
-  if IsMultiPlayerGame then
-  begin // close windows for next player
-    for i := 0 to Screen.FormCount - 1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close;
-  end
-  else
-  begin
+  if IsMultiPlayerGame then begin
+    // Close windows for next player
+    ApplyToVisibleForms(faClose);
+  end else begin
     if CityDlg.Visible then
       CityDlg.Close;
@@ -3928 +3922 @@
       UnitStatDlg.Close;
   end;
-  for i := 0 to Screen.FormCount - 1 do
-    if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-      Screen.Forms[i].Enabled := false;
+  ApplyToVisibleForms(faDisable);
 
   if Server(sTurn, pTurn, 0, nil^) >= rExecuted then
@@ -5900 +5892 @@
             ShowModal;
             MyData.ToldWonders[i] := MyRO.Wonder[i];
-          end
+          end;
     end;
     if CityCaptured and (MyMap[ToLoc] and fCity <> 0) then
@@ -6415 +6407 @@
     ((p = 0) or (1 shl p and G.RO[0].Alive <> 0)) then
   begin
-    for i := 0 to Screen.FormCount - 1 do
-      if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-        Screen.Forms[i].Close; // close windows
+    ApplyToVisibleForms(faClose);
     ItsMeAgain(p);
     SumCities(TaxSum, ScienceSum);
@@ -6745 +6735 @@
     else
       if result < rExecuted then
-        Play('INVALID')
+        Play('INVALID');
     end;
   end;
@@ -6770 +6760 @@
       end
       else
-        Server(sAbandonMap, me, 0, nil^)
+        Server(sAbandonMap, me, 0, nil^);
     end
     else
@@ -6781 +6771 @@
             Server(sResign, 0, 0, nil^);
           mrOK:
-            Server(sBreak, 0, 0, nil^)
+            Server(sBreak, 0, 0, nil^);
         end
       end
       else
-        Server(sResign, 0, 0, nil^)
+        Server(sResign, 0, 0, nil^);
     end
   else if Sender = mEmpire then
@@ -6811 +6801 @@
           CityOptimizer_BeginOfTurn;
           RevolutionChanged := true;
-        end
+        end;
       end
       else
@@ -6834 +6824 @@
       if RevolutionChanged then
         UpdateViews(true);
-    end
+    end;
   end
   else if Sender = mWebsite then
@@ -6847 +6837 @@
       MapValid := false;
       PaintAllMaps;
-    end
+    end;
   end
   else if Sender = mJump then
@@ -6871 +6861 @@
         MyMap[MyUn[UnFocus].Loc] and fTerrain)
     else
-      EnhanceDlg.ShowNewContent(wmPersistent)
+      EnhanceDlg.ShowNewContent(wmPersistent);
   end
   else if Sender = mCityTypes then
@@ -7154 +7144 @@
             begin
               MyUn[uix].Status := MyUn[uix].Status or usWaiting;
-              NewFocus := uix
+              NewFocus := uix;
             end;
           end;
@@ -7161 +7151 @@
             SetUnFocus(NewFocus);
             SetTroopLoc(Loc);
-            PanelPaint
+            PanelPaint;
           end;
         end
       else if Sender = mSelectTransport then
-        Server(sSelectTransport, me, UnFocus, nil^)
+        Server(sSelectTransport, me, UnFocus, nil^);
 end;
 
@@ -7998 +7988 @@
 
 procedure TMainScreen.SetTileSize(TileSize: TTileSize; Loc: Integer; MapPos: TPoint);
-var
-  i: integer;
 begin
   MainMap.TileSize := TileSize;
@@ -8006 +7994 @@
   SetMapPos(Loc, MapPos);
   PaintAllMaps;
-  for i := 0 to Screen.FormCount - 1 do
-    if Screen.Forms[i].Visible and (Screen.Forms[i] is TBufferedDrawDlg) then
-      TBufferedDrawDlg(Screen.Forms[i]).SmartUpdateContent(false);
+  ApplyToVisibleForms(faSmartUpdateContent);
 end;