Changeset 537 for trunk/LocalPlayer/Term.pas

Timestamp:

Apr 16, 2024, 10:35:07 AM (3 weeks ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

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

trunk/LocalPlayer/Term.pas

@@ -995 +995 @@
 procedure TMainScreen.PaintZoomedTile(Dst: TBitmap; X, Y, Loc: Integer);
 
-  procedure TSprite(xDst, yDst, xSrc, ySrc: Integer);
+  procedure TerrainSprite(xDst, yDst, xSrc, ySrc: Integer);
   begin
     with NoMapPanel do
@@ -1002 +1002 @@
   end;
 
-  procedure TSprite4(xSrc, ySrc: Integer);
+  procedure TerrainSprite4(xSrc, ySrc: Integer);
   begin
     with NoMapPanel do begin
@@ -1042 +1042 @@
 
     if Tile and fTerrain >= fForest then
-      TSprite4(2, 2)
+      TerrainSprite4(2, 2)
     else
-      TSprite4(Tile and fTerrain, 0);
+      TerrainSprite4(Tile and fTerrain, 0);
     if Tile and fTerrain >= fForest then
     begin
@@ -1051 +1051 @@
       else
         ySrc := 3 + 2 * (Tile and fTerrain - fForest);
-      TSprite(xxt, 0, 6, ySrc);
-      TSprite(0, yyt, 3, ySrc);
-      TSprite((xxt * 2), yyt, 4, ySrc + 1);
-      TSprite(xxt, (yyt * 2), 1, ySrc + 1);
+      TerrainSprite(xxt, 0, 6, ySrc);
+      TerrainSprite(0, yyt, 3, ySrc);
+      TerrainSprite((xxt * 2), yyt, 4, ySrc + 1);
+      TerrainSprite(xxt, (yyt * 2), 1, ySrc + 1);
     end;
 
@@ -1060 +1060 @@
     case Tile and fTerImp of
       tiIrrigation: begin
-        TSprite(xxt, 0, 0, 12);
-        TSprite(xxt * 2, yyt, 0, 12);
+        TerrainSprite(xxt, 0, 0, 12);
+        TerrainSprite(xxt * 2, yyt, 0, 12);
       end;
       tiFarm: begin
-        TSprite(xxt, 0, 1, 12);
-        TSprite(xxt * 2, yyt, 1, 12);
+        TerrainSprite(xxt, 0, 1, 12);
+        TerrainSprite(xxt * 2, yyt, 1, 12);
       end;
     end;
@@ -1071 +1071 @@
     // river/canal/road/railroad
     if Tile and fRiver <> 0 then begin
-      TSprite(0, yyt, 2, 14);
-      TSprite(xxt, (yyt * 2), 2, 14);
+      TerrainSprite(0, yyt, 2, 14);
+      TerrainSprite(xxt, (yyt * 2), 2, 14);
     end;
     if Tile and fCanal <> 0 then begin
-      TSprite(xxt, 0, 7, 11);
-      TSprite(xxt, 0, 3, 11);
-      TSprite(xxt * 2, yyt, 7, 11);
-      TSprite(xxt * 2, yyt, 3, 11);
+      TerrainSprite(xxt, 0, 7, 11);
+      TerrainSprite(xxt, 0, 3, 11);
+      TerrainSprite(xxt * 2, yyt, 7, 11);
+      TerrainSprite(xxt * 2, yyt, 3, 11);
     end;
     if Tile and fRR <> 0 then begin
-      TSprite((xxt * 2), yyt, 1, 10);
-      TSprite((xxt * 2), yyt, 5, 10);
-      TSprite(xxt, (yyt * 2), 1, 10);
-      TSprite(xxt, (yyt * 2), 5, 10);
+      TerrainSprite((xxt * 2), yyt, 1, 10);
+      TerrainSprite((xxt * 2), yyt, 5, 10);
+      TerrainSprite(xxt, (yyt * 2), 1, 10);
+      TerrainSprite(xxt, (yyt * 2), 5, 10);
     end
     else if Tile and fRoad <> 0 then begin
-      TSprite((xxt * 2), yyt, 8, 9);
-      TSprite((xxt * 2), yyt, 5, 9);
-      TSprite(xxt, (yyt * 2), 1, 9);
-      TSprite(xxt, (yyt * 2), 5, 9);
+      TerrainSprite((xxt * 2), yyt, 8, 9);
+      TerrainSprite((xxt * 2), yyt, 5, 9);
+      TerrainSprite(xxt, (yyt * 2), 1, 9);
+      TerrainSprite(xxt, (yyt * 2), 5, 9);
     end;
 
     if Tile and fPoll <> 0 then
-      TSprite(xxt, (yyt * 2), 6, 12);
+      TerrainSprite(xxt, (yyt * 2), 6, 12);
 
     // special
-    if Tile and (fTerrain or fSpecial) = fGrass or fSpecial1 then TSprite4(2, 1)
+    if Tile and (fTerrain or fSpecial) = fGrass or fSpecial1 then TerrainSprite4(2, 1)
     else if Tile and fSpecial <> 0 then
       if Tile and fTerrain < fForest then
-        TSprite(0, yyt, Tile and fTerrain, Tile and fSpecial shr 5)
+        TerrainSprite(0, yyt, Tile and fTerrain, Tile and fSpecial shr 5)
       else if (Tile and fTerrain = fForest) and IsJungle(Loc div G.lx) then
-        TSprite(0, yyt, 8, 17 + Tile and fSpecial shr 5)
+        TerrainSprite(0, yyt, 8, 17 + Tile and fSpecial shr 5)
       else
-        TSprite(0, yyt, 8, 2 + (Tile and fTerrain - fForest) * 2 + Tile and
+        TerrainSprite(0, yyt, 8, 2 + (Tile and fTerrain - fForest) * 2 + Tile and
           fSpecial shr 5)
     else if Tile and fDeadLands <> 0 then begin
-      TSprite4(6, 2);
-      TSprite(xxt, yyt, 8, 12 + Tile shr 25 and 3);
+      TerrainSprite4(6, 2);
+      TerrainSprite(xxt, yyt, 8, 12 + Tile shr 25 and 3);
     end;
 
     // other improvements
     case Tile and fTerImp of
-      tiMine: TSprite(xxt, 0, 2, 12);
+      tiMine: TerrainSprite(xxt, 0, 2, 12);
       tiFort: begin
-        TSprite(xxt, 0, 7, 12);
-        TSprite(xxt, 0, 3, 12);
-      end;
-     tiBase: TSprite(xxt, 0, 4, 12);
+        TerrainSprite(xxt, 0, 7, 12);
+        TerrainSprite(xxt, 0, 3, 12);
+      end;
+     tiBase: TerrainSprite(xxt, 0, 4, 12);
     end;
   end;