Changeset 404 for trunk/Forms/FormClient.pas

Timestamp:

Jan 6, 2025, 10:21:08 PM (2 days ago)

Author:

chronos

Message:

• Fixed: Crash on cyclic map new move creation.
• Modified: TView class moved into separate unit.

File:

• trunk/Forms/FormClient.pas (modified) (7 diffs)

trunk/Forms/FormClient.pas

@@ -7 +7 @@
   Game, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, Math,
   Geometry, GameClient, GameProtocol, Threading, Player, ClientGUI, FormEx,
-  Generics.Collections;
+  Generics.Collections, View;
 
 const
@@ -75 +75 @@
     FClient: TClientGUI;
     TempBitmap: TBitmap;
+    TempView: TView;
     StartMousePoint: TPoint;
     StartViewPoint: TPoint;
@@ -186 +187 @@
   CountP: TPoint;
   X, Y: Integer;
-  TempView: TView;
 begin
   DrawStart := Now;
@@ -205 +205 @@
 
       if Game.CyclicMap then begin
-        TempView := TView.Create;
         TempView.Game := Game;
         //R := View.CellToCanvasRect(TRect.Create(Game.Map.Cells.First.PosPx,
@@ -278 +277 @@
           end;
         end;
-        TempView.Free;
         for Y := 0 to CountP.Y do begin
           for X := 0 to CountP.X do begin
@@ -432 +430 @@
   //DoubleBuffered := True;
   TempBitmap := TBitmap.Create;
+  TempView := TView.Create;
   TimerPeriod := 0;
   LastTimerTime := Now;
@@ -518 +517 @@
 begin
   Client := nil;
-  TempBitmap.Free;
+  FreeAndNil(TempBitmap);
+  FreeAndNil(TempView);
 end;