Changeset 316

Timestamp:

Mar 18, 2021, 11:31:20 PM (4 years ago)

Author:

chronos

Message:

• Modified: Some Templates items used as TGraphicSetItem.

Location:

trunk

Files:

• Graphics/Templates.grs (added)
• LocalPlayer/MessgEx.pas (modified) (3 diffs)
• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (8 diffs)
• Start.pas (modified) (1 diff)

trunk/LocalPlayer/MessgEx.pas

@@ -233 +233 @@
   hScrewed = 27;
 var
-  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon, xb, yb, wb, hb: integer;
+  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: integer;
+  BookRect: TRect;
   x1, xR, yR, share: single;
   Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
@@ -282 +283 @@
     end;
     BigImp.EndUpdate;
-    xb := xBBook;
-    yb := yBBook;
-    wb := wBBook;
-    hb := hBBook;
+    BookRect := BigBook.BoundsRect;
   end
   else
   begin
-    xb := xSBook;
-    yb := ySBook;
-    wb := wSBook;
-    hb := hSBook;
-  end;
-  x := x - wb div 2;
+    BookRect := SmallBook.BoundsRect;
+  end;
+  x := x - BookRect.Width div 2;
 
   // paint
   // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
   LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y);
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, x, y);
 
   if IconIndex >= 0 then
@@ -310 +305 @@
             Trunc(Screwed[ix, iy, 0] / Screwed[ix, iy, 3]) shl 16;
 
-  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, xb, yb, wb, hb, clCover, clPage);
-
-  BitBltCanvas(ca, x, y, wb, hb, LogoBuffer.Canvas, 0, 0);
+  ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), BookRect, clCover, clPage);
+
+  BitBltCanvas(ca, x, y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
 end;
 

trunk/LocalPlayer/Term.pas

@@ -4843 +4843 @@
   end;
   if GameMode <> cMovie then
-    ImageOp_BCC(TopBar, Templates.Data, 2, 1, 145, 38, 36, 36, $BFBF20, $4040DF);
+    ImageOp_BCC(TopBar, Templates.Data, Point(2, 1), MenuLogo.BoundsRect, $BFBF20, $4040DF);
   if MyRO.nCity > 0 then
   begin

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -49 +49 @@
 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;
-  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: Integer);
+procedure ImageOp_BCC(Dst, Src: TBitmap;
+  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: Integer); overload;
+procedure ImageOp_BCC(Dst, Src: TBitmap;
+  DstPos: TPoint; SrcRect: TRect; Color1, Color2: Integer); overload;
 procedure ImageOp_CBC(Dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
   Color0, Color2: Integer);
@@ -115 +117 @@
 
   // template positions in Templates.png
-  xLogo = 1;
-  yLogo = 1;
-  wLogo = 122;
-  hLogo = 23; // logo
-  xBBook = 1;
-  yBBook = 74;
-  wBBook = 143;
-  hBBook = 73; // big book
-  xSBook = 72;
-  ySBook = 37;
-  wSBook = 72;
-  hSBook = 36; // small book
   xNation = 1;
   yNation = 25;
@@ -177 +167 @@
   Ornament: TGraphicSetItem;
   Logo: TGraphicSetItem;
+  BigBook: TGraphicSetItem;
+  SmallBook: TGraphicSetItem;
+  MenuLogo: TGraphicSetItem;
   ClickFrameColor: Integer;
   MainTextureAge: Integer;
@@ -734 +727 @@
   Src.EndUpdate;
   dst.EndUpdate;
+end;
+
+procedure ImageOp_BCC(Dst, Src: TBitmap; DstPos: TPoint; SrcRect: TRect;
+  Color1, Color2: Integer);
+begin
+  ImageOp_BCC(Dst, Src, DstPos.X, DstPos.Y, SrcRect.Left, SrcRect.Top,
+    SrcRect.Width, SrcRect.Height, Color1, Color2);
 end;
 
@@ -1498 +1498 @@
   // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
   LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wLogo, hLogo, ca, x, y);
-  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, 1, 1, wLogo, hLogo,
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, Logo.Width, Logo.Height, ca, x, y);
+  ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), Logo.BoundsRect,
     clLight, clShade);
-  BitBltCanvas(ca, x, y, wLogo, hLogo, LogoBuffer.Canvas, 0, 0);
+  BitBltCanvas(ca, x, y, Logo.Width, Logo.Height, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -1682 +1682 @@
   LoadFonts;
   Templates := LoadGraphicSet2('Templates.png');
+  Logo := Templates.GetItem('Logo');
+  BigBook := Templates.GetItem('BigBook');
+  SmallBook := Templates.GetItem('SmallBook');
+  MenuLogo := Templates.GetItem('MenuLogo');
   LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
@@ -1698 +1702 @@
   ResolutionChanged := False;
   {$ENDIF}
-
-  LogoBuffer := TBitmap.Create;
-  LogoBuffer.PixelFormat := pf24bit;
-  LogoBuffer.SetSize(wBBook, hBBook);
 
   for Section := Low(TFontType) to High(TFontType) do
@@ -1728 +1728 @@
 
   LoadAssets;
+
+  LogoBuffer := TBitmap.Create;
+  LogoBuffer.PixelFormat := pf24bit;
+  LogoBuffer.SetSize(BigBook.Width, BigBook.Height);
 end;
 

trunk/Start.pas

@@ -827 +827 @@
       TabOffset + (Integer(Tab) + 1) * TabSize + 2, TabHeight, MainTexture.clBevelShade,
       MainTexture.clBevelShade); // Tab shadow
+
+  // Paint menu logo
   // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
   LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, 36, 36, Canvas, 6,
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
     3 + 2 * integer(Tab <> tbMain));
 
-  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, 145, 38, 36, 27, $BFBF20, $4040DF);
-  // logo part 1
-  ImageOp_BCC(LogoBuffer, Templates.Data, 10, 27, 155, 38 + 27, 26, 9, $BFBF20,
-    $4040DF); // logo part 2
-  BitBltCanvas(Canvas, 6, 3 + 2 * integer(Tab <> tbMain), 36, 36,
+  ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, MenuLogo.Left, MenuLogo.Top,
+    MenuLogo.Width, MenuLogo.Height - 9, $BFBF20, $4040DF); // logo part 1
+  ImageOp_BCC(LogoBuffer, Templates.Data, 10, 27, MenuLogo.Left + 10,
+    MenuLogo.Top + 27, MenuLogo.Width - 10, 9, $BFBF20, $4040DF); // logo part 2
+  BitBltCanvas(Canvas, 6, 3 + 2 * integer(Tab <> tbMain), MenuLogo.Width, MenuLogo.Height,
     LogoBuffer.Canvas, 0, 0);