Changeset 40 for trunk

Timestamp:

Jan 9, 2017, 8:28:51 PM (8 years ago)

Author:

chronos

Message:

• Fixed: More bitmaps to solve black background problem.
• Fixed: Bad drawing of gradient lines.

Location:

trunk

Files:

• LocalPlayer/BaseWin.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (1 diff)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (1 diff)
• LocalPlayer/UnitStat.lfm (modified) (5 diffs)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• ScreenTools.pas (modified) (4 diffs)
• Start.pas (modified) (1 diff)

trunk/LocalPlayer/BaseWin.pas

@@ -476 +476 @@
   else
     Offscreen.Height := Screen.Height - yUnused;
+  Offscreen.Canvas.FillRect(0, 0, Offscreen.Width, OffScreen.Height);
   Offscreen.Canvas.Brush.Style := bsClear;
 end;

trunk/LocalPlayer/Draft.pas

@@ -88 +88 @@
   Back := TBitmap.Create;
   Back.PixelFormat := pf24bit;
-  Back.Width := ClientWidth;
-  Back.Height := ClientHeight;
+  Back.SetSize(ClientWidth, ClientHeight);
+  Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
   LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes', gfNoGamma);

trunk/LocalPlayer/Help.pas

@@ -231 +231 @@
   TerrIcon := TBitmap.Create;
   TerrIcon.PixelFormat := pf24bit;
-  TerrIcon.Width := xSizeBig;
-  TerrIcon.Height := ySizeBig;
+  TerrIcon.SetSize(xSizeBig, ySizeBig);
+  TerrIcon.Canvas.FillRect(0, 0, TerrIcon.Width, TerrIcon.Height);
   SearchContent := '';
   nHist := -1;

trunk/LocalPlayer/IsoEngine.pas

@@ -399 +399 @@
   Borders := TBitmap.Create;
   Borders.PixelFormat := pf24bit;
-  Borders.Width := xxt * 2;
-  Borders.Height := (yyt * 2) * nPl;
+  Borders.SetSize(xxt * 2,(yyt * 2) * nPl);
+  Borders.Canvas.FillRect(0, 0, Borders.Width, Borders.Height);
   BordersOK := 0;
 end;

trunk/LocalPlayer/NatStat.pas

@@ -89 +89 @@
   Back := TBitmap.Create;
   Back.PixelFormat := pf24bit;
-  Back.Width := ClientWidth;
-  Back.Height := ClientHeight;
+  Back.SetSize(ClientWidth, ClientHeight);
+  Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TBitmap.Create;
   LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Nation', gfNoGamma);

trunk/LocalPlayer/Select.pas

@@ -108 +108 @@
   ScienceNationDot := TBitmap.Create;
   ScienceNationDot.PixelFormat := pf24bit;
-  ScienceNationDot.Width := 17;
-  ScienceNationDot.Height := 17;
+  ScienceNationDot.SetSize(17, 17);
+  ScienceNationDot.Canvas.FillRect(0, 0, ScienceNationDot.Width, ScienceNationDot.Height);
 end;
 

trunk/LocalPlayer/UnitStat.lfm

@@ -1 +1 @@
 object UnitStatDlg: TUnitStatDlg
   Left = 344
+  Height = 326
   Top = 213
+  Width = 208
   BorderStyle = bsNone
   ClientHeight = 326
   ClientWidth = 208
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -13
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   FormStyle = fsStayOnTop
   OnClose = FormClose
@@ -16 +16 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  PixelsPerInch = 96
+  LCLVersion = '1.6.2.0'
   object SwitchBtn: TButtonB
     Left = 12
+    Height = 25
     Top = 29
     Width = 25
-    Height = 25
     Down = False
     Permanent = False
@@ -29 +29 @@
   object CloseBtn: TButtonB
     Left = 177
+    Height = 25
     Top = 6
     Width = 25
-    Height = 25
     Down = False
     Permanent = False
@@ -39 +39 @@
   object ConscriptsBtn: TButtonB
     Left = 43
+    Height = 25
     Top = 29
     Width = 25
-    Height = 25
     Down = False
     Permanent = False
@@ -49 +49 @@
   object HelpBtn: TButtonC
     Left = 178
+    Height = 12
     Top = 145
     Width = 12
-    Height = 12
     Down = False
     Permanent = False

trunk/LocalPlayer/UnitStat.pas

@@ -80 +80 @@
   Back := TBitmap.Create;
   Back.PixelFormat := pf24bit;
-  Back.Width := 5 * wCommon;
-  Back.Height := hMax;
+  Back.SetSize(5 * wCommon, hMax);
+  Back.Canvas.FillRect(0, 0, Back.Width,Back.Height);
   Template := TBitmap.Create;
   LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Unit', gfNoGamma);

trunk/ScreenTools.pas

@@ -983 +983 @@
   yOffset: integer);
 begin
-  assert((Left + xOffset >= 0) and (Left + xOffset + Width <= wMainTexture) and
+  Assert((Left + xOffset >= 0) and (Left + xOffset + Width <= wMainTexture) and
     (Top + yOffset >= 0) and (Top + yOffset + Height <= hMainTexture));
   BitBlt(ca.Handle, Left, Top, Width, Height, MainTexture.Image.Canvas.Handle,
@@ -1056 +1056 @@
         Texture.Height - y0cut - y1cut, Texture.Canvas.Handle, x0cut,
         y0cut, SRCCOPY);
-    end
+    end;
   end;
 end;
@@ -1199 +1199 @@
       i, r, g, b: integer;
     begin
-      with ca do
       begin
         for i := 0 to 15 do
@@ -1218 +1217 @@
           else if b >= 256 then
             b := 255;
-          Pen.Color := r + g shl 8 + b shl 16;
-          MoveTo(x + dx * i, y + dy * i);
-          LineTo(x + dx * i + Width, y + dy * i + Height);
+          ca.Pen.Color := r + g shl 8 + b shl 16;
+          ca.MoveTo(x + dx * i, y + dy * i);
+          ca.LineTo(x + dx * i + Width, y + dy * i + Height);
         end;
-        Pen.Color := $000000;
-        MoveTo(x + 1, y + 16 * dy + Height);
-        LineTo(x + 16 * dx + Width, y + 16 * dy + Height);
-        LineTo(x + 16 * dx + Width, y);
+        ca.Pen.Color := $000000;
+        ca.MoveTo(x + 1, y + 16 * dy + Height);
+        ca.LineTo(x + 16 * dx + Width, y + 16 * dy + Height);
+        ca.LineTo(x + 16 * dx + Width, y);
       end
     end;

trunk/Start.pas

@@ -374 +374 @@
   EmptyPicture := TBitmap.Create;
   EmptyPicture.PixelFormat := pf24bit;
-  EmptyPicture.width := 64;
-  EmptyPicture.height := 64;
+  EmptyPicture.SetSize(64, 64);
+  EmptyPicture.Canvas.FillRect(0, 0, EmptyPicture.Width, EmptyPicture.Height);
   LogoBuffer := TBitmap.Create;
   LogoBuffer.PixelFormat := pf24bit;
-  LogoBuffer.width := wBuffer;
-  LogoBuffer.height := 56;
+  LogoBuffer.SetSize(wBuffer, 56);
+  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
 
   Mini := TBitmap.Create;