Changeset 349 for branches/highdpi/LocalPlayer/Nego.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/Nego.pas (modified) (4 diffs)

branches/highdpi/LocalPlayer/Nego.pas

@@ -149 +149 @@
       with TButtonN(Components[cix]) do
       begin
-        Graphic := GrExt[HGrSystem].Data;
-        Mask := GrExt[HGrSystem].Mask;
-        BackGraphic := GrExt[HGrSystem2].Data;
+        Graphic := HGrSystem.Data;
+        Mask := HGrSystem.Mask;
+        BackGraphic := HGrSystem2.Data;
         case Tag shr 8 of
           1:
@@ -432 +432 @@
     Brush.Color := $000000;
     Tribe[p].InitAge(GetAge(p));
-    if Tribe[p].faceHGr >= 0 then
+    if Assigned(Tribe[p].faceHGr) then
       Dump(Offscreen, Tribe[p].faceHGr, X, Y, 64, 48,
         1 + Tribe[p].facepix mod 10 * 65, 1 + Tribe[p].facepix div 10 * 49)
@@ -681 +681 @@
 procedure TNegoDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -690 +690 @@
   begin
     if OkBtn.Visible then
-      OkBtnClick(nil)
+      OkBtnClick(nil);
   end
   else
-    inherited
+    inherited;
 end;