Changeset 211 for trunk

Timestamp:

May 9, 2020, 9:04:03 PM (5 years ago)

Author:

chronos

Message:

• Modified: MakeRed function moved to ScreenTools after MakeBlue function.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (5 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -435 +435 @@
     end;
   end;
-
-  procedure MakeRed(X, Y, W, H: Integer);
-  var
-    XX, YY: Integer;
-    Gray: Integer;
-    PixelPtr: TPixelPointer;
-  begin
-    Offscreen.BeginUpdate;
-    PixelPtr := PixelPointer(Offscreen, X, Y);
-    for YY := 0 to H - 1 do begin
-      for XX := 0 to W - 1 do begin
-        Gray := (Integer(PixelPtr.Pixel^.B) + Integer(PixelPtr.Pixel^.G) +
-        Integer(PixelPtr.Pixel^.R)) * 85 shr 8;
-        PixelPtr.Pixel^.B := 0;
-        PixelPtr.Pixel^.G := 0;
-        PixelPtr.Pixel^.R := Gray; // 255-(255-gray) div 2;
-        PixelPtr.NextPixel;
-      end;
-      PixelPtr.NextLine;
-    end;
-    Offscreen.EndUpdate;
-  end;
-
 var
   line, MessageCount: integer;
@@ -561 +538 @@
   if not IsCityAlive then
   begin
-    MakeRed(18, 280, 298, 40);
+    MakeRed(Offscreen, 18, 280, 298, 40);
     if cGov = gAnarchy then
       s := Phrases.Lookup('GOVERNMENT', gAnarchy)
@@ -697 +674 @@
     else
     begin
-      MakeRed(xHapp + dxBar - 6, yHapp + 2 * dyBar, wBar + 10, 38);
+      MakeRed(Offscreen, xHapp + dxBar - 6, yHapp + 2 * dyBar, wBar + 10, 38);
       CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 18,
         Phrases.Lookup('LACK'), -Report.HappinessBalance, RedTex);
@@ -722 +699 @@
     else
     begin
-      MakeRed(xFood + dxBar - 6, yFood + 2 * dyBar, wBar + 10, 38);
+      MakeRed(Offscreen, xFood + dxBar - 6, yFood + 2 * dyBar, wBar + 10, 38);
       CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 1,
         Phrases.Lookup('LACK'), -Report.FoodSurplus, RedTex);
@@ -755 +732 @@
     else
     begin
-      MakeRed(xProd + dxBar - 6, yProd + dyBar + 17, wBar + 10, 38);
+      MakeRed(Offscreen, xProd + dxBar - 6, yProd + dyBar + 17, wBar + 10, 38);
       CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 3,
         Phrases.Lookup('LACK'), -Report.Production, RedTex);

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -35 +35 @@
 procedure Sprite(dst: TBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
   overload;
-procedure MakeBlue(dst: TBitmap; x, y, Width, Height: Integer);
+procedure MakeBlue(Dst: TBitmap; X, Y, Width, Height: Integer);
+procedure MakeRed(Dst: TBitmap; X, Y, Width, Height: Integer);
 procedure ImageOp_B(dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, Width, Height: Integer);
 procedure ImageOp_BCC(dst, Src: TBitmap;
@@ -538 +539 @@
 end;
 
-procedure MakeBlue(dst: TBitmap; x, y, Width, Height: Integer);
-var
-  XX, YY: integer;
+procedure MakeBlue(Dst: TBitmap; X, Y, Width, Height: Integer);
+var
+  XX, YY: Integer;
   PixelPtr: TPixelPointer;
 begin
@@ -550 +551 @@
       PixelPtr.Pixel^.G := PixelPtr.Pixel^.G div 2;
       PixelPtr.Pixel^.R := PixelPtr.Pixel^.R div 2;
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
+  end;
+  Dst.EndUpdate;
+end;
+
+procedure MakeRed(Dst: TBitmap; X, Y, Width, Height: Integer);
+var
+  XX, YY: Integer;
+  Gray: Integer;
+  PixelPtr: TPixelPointer;
+begin
+  Dst.BeginUpdate;
+  PixelPtr := PixelPointer(Dst, X, Y);
+  for YY := 0 to Height - 1 do begin
+    for XX := 0 to Width - 1 do begin
+      Gray := (Integer(PixelPtr.Pixel^.B) + Integer(PixelPtr.Pixel^.G) +
+        Integer(PixelPtr.Pixel^.R)) * 85 shr 8;
+      PixelPtr.Pixel^.B := 0;
+      PixelPtr.Pixel^.G := 0;
+      PixelPtr.Pixel^.R := Gray; // 255-(255-gray) div 2;
       PixelPtr.NextPixel;
     end;