Changeset 316 for trunk/LocalPlayer

Timestamp:

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

Author:

chronos

Message:

• Modified: Some Templates items used as TGraphicSetItem.

Location:

trunk/LocalPlayer

Files:

• MessgEx.pas (modified) (3 diffs)
• Term.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