Changeset 352 for trunk/LocalPlayer/Term.pas

Timestamp:

Apr 6, 2021, 10:16:55 PM (3 years ago)

Author:

chronos

Message:

• Modified: TTexture changed from record to class.
• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Term.pas (modified) (18 diffs)

trunk/LocalPlayer/Term.pas

@@ -1691 +1691 @@
         Controls[i].Visible := false;
     me := -1;
-    SetMainTextureByAge(-1);
+    MainTexture.Age := -1;
     with Panel.Canvas do
     begin
@@ -1728 +1728 @@
     { if MyRO.Happened and phGameEnd<>0 then
       begin
-      Age:=3;
-      SetMainTextureByAge(-1);
+      Age := 3;
+      MainTexture.Age := -1;
       end
       else }
     begin
       Age := GetAge(me);
-      if SetMainTextureByAge(Age) then
+      if MainTexture.Age <> Age then begin
+        MainTexture.Age := Age;
         EOT.Invalidate; // has visible background parts in its bounds
+      end;
     end;
     // age:=MyRO.Turn mod 4; //!!!
@@ -1748 +1750 @@
   begin
     Age := 0;
-    SetMainTextureByAge(-1);
+    MainTexture.Age := -1;
     if ClientMode = cMovieTurn then
       EOT.ButtonIndex := eotCancel
@@ -2538 +2540 @@
         Age := 0;
         if Command = cHelpOnly then
-          SetMainTextureByAge(-1);
+          MainTexture.Age := -1;
         Tribes.Init;
         HelpDlg.UserLeft := (Screen.width - HelpDlg.width) div 2;
@@ -4265 +4267 @@
         xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2,
         xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + 2 + G.ly - 1,
-        MainTexture.clMark, MainTexture.clMark)
+        MainTexture.ColorMark, MainTexture.ColorMark)
     else
       Frame(Panel.Canvas,
         xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2 + yw,
         xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + yw + MapHeight div yyt,
-        MainTexture.clMark, MainTexture.clMark);
+        MainTexture.ColorMark, MainTexture.ColorMark);
   end;
 end;
@@ -4301 +4303 @@
   begin
     Fill(Panel.Canvas, 0, 3, xMidPanel + 7 - 10, PanelHeight - 3,
-      wMainTexture - (xMidPanel + 7 - 10), hMainTexture - PanelHeight);
+      MainTexture.Width - (xMidPanel + 7 - 10), MainTexture.Height - PanelHeight);
     Fill(Panel.Canvas, xRightPanel + 10 - 7, 3, Panel.width - xRightPanel - 10 +
-      7, PanelHeight - 3, -(xRightPanel + 10 - 7), hMainTexture - PanelHeight);
+      7, PanelHeight - 3, -(xRightPanel + 10 - 7), MainTexture.Height - PanelHeight);
     FillLarge(Panel.Canvas, xMidPanel - 2, PanelHeight - MidPanelHeight,
       xRightPanel + 2, PanelHeight, ClientWidth div 2);
@@ -4315 +4317 @@
     LineTo(xRightPanel, 0);
     LineTo(ClientWidth, 0);
-    Pen.Color := MainTexture.clBevelLight;
+    Pen.Color := MainTexture.ColorBevelLight;
     MoveTo(xMidPanel + 7 - 9, PanelHeight - MidPanelHeight + 2);
     LineTo(xRightPanel + 10 - 8, PanelHeight - MidPanelHeight + 2);
-    Pen.Color := MainTexture.clBevelLight;
+    Pen.Color := MainTexture.ColorBevelLight;
     MoveTo(0, 1);
     LineTo(xMidPanel + 7 - 9, 1);
-    Pen.Color := MainTexture.clBevelShade;
+    Pen.Color := MainTexture.ColorBevelShade;
     LineTo(xMidPanel + 7 - 9, PanelHeight - MidPanelHeight + 1);
-    Pen.Color := MainTexture.clBevelLight;
+    Pen.Color := MainTexture.ColorBevelLight;
     LineTo(xRightPanel + 10 - 9, PanelHeight - MidPanelHeight + 1);
-    Pen.Color := MainTexture.clBevelLight;
+    Pen.Color := MainTexture.ColorBevelLight;
     LineTo(xRightPanel + 10 - 9, 1);
     LineTo(ClientWidth, 1);
@@ -4333 +4335 @@
     MoveTo(0, 2);
     LineTo(xMidPanel + 7 - 10, 2);
-    Pen.Color := MainTexture.clBevelShade;
+    Pen.Color := MainTexture.ColorBevelShade;
     LineTo(xMidPanel + 7 - 10, PanelHeight);
     Corner(Panel.Canvas, xMidPanel + 7 - 16, 1, 1, MainTexture);
@@ -4472 +4474 @@
               ScreenTools.Frame(Panel.Canvas, xTroop + 1 + x,
                 yTroop + 6 - yyt div 2, xTroop + 2 * xxt - 1 + x,
-                yTroop + 2 * yyt + 10, MainTexture.clMark, MainTexture.clMark);
+                yTroop + 2 * yyt + 10, MainTexture.ColorMark, MainTexture.ColorMark);
             end;
           end;
@@ -4590 +4592 @@
         else
           x := xTroop - 152;
-        Pen.Color := MainTexture.clBevelShade;
+        Pen.Color := MainTexture.ColorBevelShade;
         MoveTo(x - 1, PanelHeight - MidPanelHeight + 2);
         LineTo(x - 1, PanelHeight);
-        Pen.Color := MainTexture.clBevelLight;
+        Pen.Color := MainTexture.ColorBevelLight;
         MoveTo(x, PanelHeight - MidPanelHeight + 2);
         LineTo(x, PanelHeight);
@@ -4631 +4633 @@
                         ScreenTools.Frame(Panel.Canvas, xTroop + 3 + x,
                           yTroop + 2, xTroop + 63 + x, yTroop + 46,
-                          MainTexture.clMark, MainTexture.clMark);
+                          MainTexture.ColorMark, MainTexture.ColorMark);
                       end
                       else if (unx.Master >= 0) and (unx.Master = UnFocus) then
@@ -4638 +4640 @@
                           xTroop + 64 + x, yTroop + 47, 8, $000000);
                         CFrame(Panel.Canvas, xTroop + 3 + x, yTroop + 2,
-                          xTroop + 63 + x, yTroop + 46, 8, MainTexture.clMark);
+                          xTroop + 63 + x, yTroop + 46, 8, MainTexture.ColorMark);
                       end;
                       NoMapPanel.SetOutput(Panel);
@@ -4733 +4735 @@
           RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
             (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
-            PanelHeight, MainTexture.clBevelShade, MainTexture.clBevelLight)
+            PanelHeight, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight)
     end; { if TroopLoc>=0 }
   end;
@@ -4749 +4751 @@
           RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
             (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
-            PanelHeight, MainTexture.clBevelShade, MainTexture.clBevelLight);
+            PanelHeight, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
         end;
       end;
@@ -4763 +4765 @@
           RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
             (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
-            PanelHeight, MainTexture.clBevelShade, MainTexture.clBevelLight);
+            PanelHeight, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
         end;
   end;
@@ -4780 +4782 @@
     MoveTo(0, TopBarHeight - 1);
     LineTo(ClientWidth, TopBarHeight - 1);
-    Pen.Color := MainTexture.clBevelShade;
+    Pen.Color := MainTexture.ColorBevelShade;
     MoveTo(0, TopBarHeight - 2);
     LineTo(ClientWidth, TopBarHeight - 2);
     MoveTo(0, TopBarHeight - 3);
     LineTo(ClientWidth, TopBarHeight - 3);
-    Pen.Color := MainTexture.clBevelLight;
+    Pen.Color := MainTexture.ColorBevelLight;
     ScreenTools.Frame(TopBar.Canvas, 40, -1, xTreasurySection - 1,
-      TopBarHeight - 7, MainTexture.clBevelShade, MainTexture.clBevelLight);
+      TopBarHeight - 7, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
     ScreenTools.Frame(TopBar.Canvas, xResearchSection + 332, -1, ClientWidth,
-      TopBarHeight - 7, MainTexture.clBevelShade, MainTexture.clBevelLight);
+      TopBarHeight - 7, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
   end;
   if GameMode <> cMovie then
@@ -5224 +5226 @@
           Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
             yMini + 2, xMini + 1 + G.lx + MapWidth div (2 * xxt),
-            yMini + 2 + G.ly - 1, MainTexture.clMark, MainTexture.clMark)
+            yMini + 2 + G.ly - 1, MainTexture.ColorMark, MainTexture.ColorMark)
         else
           Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
             yMini + 2 + yw, xMini + 2 + G.lx + MapWidth div (2 * xxt) - 1,
-            yMini + 2 + yw + MapHeight div yyt - 2, MainTexture.clMark,
-            MainTexture.clMark);
+            yMini + 2 + yw + MapHeight div yyt - 2, MainTexture.ColorMark,
+            MainTexture.ColorMark);
       end;
       RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
@@ -7492 +7494 @@
         Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), 0,
           x - xMini - 2 + MapWidth div (xxt * 2) - 1, G.ly - 1,
-          MainTexture.clMark, MainTexture.clMark)
+          MainTexture.ColorMark, MainTexture.ColorMark)
       else
         Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), yw,
           x - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
-          2, MainTexture.clMark, MainTexture.clMark);
+          2, MainTexture.ColorMark, MainTexture.ColorMark);
       BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         Buffer.Canvas, 0, 0);