Changeset 352 for trunk/LocalPlayer/CityType.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/LocalPlayer/CityType.pas (modified) (4 diffs)

trunk/LocalPlayer/CityType.pas

@@ -93 +93 @@
 
   Frame(offscreen.Canvas, 0, yList + 32 * nListRow, InnerWidth - 255,
-    yPool - 23, MainTexture.clBevelLight, MainTexture.clBevelShade);
+    yPool - 23, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
   Frame(offscreen.Canvas, InnerWidth - 254, yList + 32 * nListRow,
-    InnerWidth - 89, yPool - 23, MainTexture.clBevelLight,
-    MainTexture.clBevelShade);
+    InnerWidth - 89, yPool - 23, MainTexture.ColorBevelLight,
+    MainTexture.ColorBevelShade);
   Frame(offscreen.Canvas, InnerWidth - 88, yList + 32 * nListRow,
-    InnerWidth - 1, yPool - 23, MainTexture.clBevelLight,
-    MainTexture.clBevelShade);
+    InnerWidth - 1, yPool - 23, MainTexture.ColorBevelLight,
+    MainTexture.ColorBevelShade);
   Frame(offscreen.Canvas, 0, yPool - 22, InnerWidth - 1, yPool - 1,
-    MainTexture.clBevelLight, MainTexture.clBevelShade);
+    MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
   for i := 0 to nCityType - 1 do
   begin
     RFrame(offscreen.Canvas, xSwitch + i * 42, ySwitch, xSwitch + 39 + i * 42,
-      ySwitch + 23, MainTexture.clBevelShade, MainTexture.clBevelLight);
+      ySwitch + 23, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
     if i = ctype then
       Frame(offscreen.Canvas, xSwitch + 1 + i * 42, ySwitch + 1,
-        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.clBevelShade,
-        MainTexture.clBevelLight)
+        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.ColorBevelShade,
+        MainTexture.ColorBevelLight)
     else
       Frame(offscreen.Canvas, xSwitch + 1 + i * 42, ySwitch + 1,
-        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.clBevelLight,
-        MainTexture.clBevelShade);
+        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.ColorBevelLight,
+        MainTexture.ColorBevelShade);
     BitBltCanvas(offscreen.Canvas, xSwitch + 2 + i * 42, ySwitch + 2,
       xSizeSmall, ySizeSmall, SmallImp.Canvas, (i + 3) * xSizeSmall, 0);
@@ -130 +130 @@
     for i := 1 to nListRow - 1 do
       DLine(offscreen.Canvas, xList - 5, xList + 4 + 42 * nListCol,
-        yList - 1 + 32 * i, MainTexture.clBevelLight, MainTexture.clBevelShade);
+        yList - 1 + 32 * i, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
     for i := 0 to nListCol * nListRow - 1 do
     begin
       s := IntToStr(i + 1);
-      Font.Color := MainTexture.clTextLight;
+      Font.Color := MainTexture.ColorTextLight;
       Textout(xList + 20 + i mod nListCol * 42 - TextWidth(s) div 2,
         yList + 15 + i div nListCol * 32 - TextHeight(s) div 2, s);
@@ -147 +147 @@
       xList + 21 + xSizeSmall div 2 + i mod nListCol * 42,
       yList + 16 + ySizeSmall div 2 + i div nListCol * 32,
-      MainTexture.clBevelLight, MainTexture.clBevelShade);
+      MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
     BitBltCanvas(offscreen.Canvas, xList + 21 - xSizeSmall div 2 +
       i mod nListCol * 42, yList + 16 - ySizeSmall div 2 + i div nListCol * 32,
@@ -169 +169 @@
         nPool div nPoolCol * 32, xPool + 21 + xSizeSmall div 2 +
         nPool mod nPoolCol * 42, yPool + 16 + ySizeSmall div 2 +
-        nPool div nPoolCol * 32, MainTexture.clBevelLight,
-        MainTexture.clBevelShade);
+        nPool div nPoolCol * 32, MainTexture.ColorBevelLight,
+        MainTexture.ColorBevelShade);
       BitBltCanvas(offscreen.Canvas, xPool + 21 - xSizeSmall div 2 +
         nPool mod nPoolCol * 42, yPool + 16 - ySizeSmall div 2 +