Changeset 303 for branches/highdpi/LocalPlayer/Help.pas

Timestamp:

Mar 9, 2021, 9:19:49 AM (4 years ago)

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

• branches/highdpi/LocalPlayer/Help.pas (modified) (10 diffs)

branches/highdpi/LocalPlayer/Help.pas

@@ -127 +127 @@
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global,
+  UKeyBindings;
 
 {$R *.lfm}
@@ -207 +208 @@
 destructor THyperText.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -1242 +1243 @@
       until FindNext(sr) <> 0;
     FindClose(sr);
-    Plus.Free;
+    FreeAndNil(Plus);
 
     List.Sort;
@@ -1259 +1260 @@
       MainText.AddLine(s);
     end;
-    List.Free;
+    FreeAndNil(List);
   end;
 
@@ -1277 +1278 @@
       MainText.AddLine(s);
     end;
-    List.Free;
+    FreeAndNil(List);
   end;
 
@@ -1439 +1440 @@
             AppendList(List);
           end;
-          List.Free;
+          FreeAndNil(List);
         end
         else // single advance
@@ -1538 +1539 @@
           List.Sort;
           AppendList(List);
-          List.Free;
+          FreeAndNil(List);
         end
         else if no = 201 then
@@ -1827 +1828 @@
             AppendList(List);
           end;
-          List.Free;
+          FreeAndNil(List);
         end
         else
@@ -1988 +1989 @@
     OffscreenPaint;
     Invalidate;
-    HistItem.Free;
+    FreeAndNil(HistItem);
   end;
 end;
@@ -2016 +2017 @@
   Shift: TShiftState);
 begin
-  if Key = VK_F1 then // my key
+  if KeyToShortCut(Key, Shift) = BHelp.ShortCut then // my key
   else
-    inherited
+    inherited;
 end;