X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_gui.pas;h=d59c838557761d29290813f3c667d366ec248151;hb=48fa53d341e432475432901a339f1ae81fda7809;hp=d7735ab374d568a4e51cf47c543f1a2c458d7522;hpb=923fa980434e55419f35422119af2faae2bf68d7;p=d2df-sdl.git

diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas
index d7735ab..d59c838 100644
--- a/src/game/g_gui.pas
+++ b/src/game/g_gui.pas
@@ -2810,61 +2810,68 @@ begin
   try
     map := g_Map_ParseMap(Data, Len);
   except
+    FreeMem(Data);
     map.Free();
-    raise;
+    //raise;
+    exit;
   end;
 
   FreeMem(Data);
 
-  panlist := map.field['panel'];
-  //header := GetMapHeader(map);
+  if (map = nil) then exit;
 
-  FMapSize.X := map.Width div 16;
-  FMapSize.Y := map.Height div 16;
+  try
+    panlist := map.field['panel'];
+    //header := GetMapHeader(map);
 
-  rX := Ceil(map.Width / (MAPPREVIEW_WIDTH*256.0));
-  rY := Ceil(map.Height / (MAPPREVIEW_HEIGHT*256.0));
-  FScale := max(rX, rY);
+    FMapSize.X := map.Width div 16;
+    FMapSize.Y := map.Height div 16;
 
-  FMapData := nil;
+    rX := Ceil(map.Width / (MAPPREVIEW_WIDTH*256.0));
+    rY := Ceil(map.Height / (MAPPREVIEW_HEIGHT*256.0));
+    FScale := max(rX, rY);
 
-  if (panlist <> nil) then
-  begin
-    for pan in panlist do
+    FMapData := nil;
+
+    if (panlist <> nil) then
     begin
-      if (pan.PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or
-                                           PANEL_STEP or PANEL_WATER or
-                                           PANEL_ACID1 or PANEL_ACID2)) <> 0 then
+      for pan in panlist do
       begin
-        SetLength(FMapData, Length(FMapData)+1);
-        with FMapData[High(FMapData)] do
+        if (pan.PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or
+                                             PANEL_STEP or PANEL_WATER or
+                                             PANEL_ACID1 or PANEL_ACID2)) <> 0 then
         begin
-          X1 := pan.X div 16;
-          Y1 := pan.Y div 16;
+          SetLength(FMapData, Length(FMapData)+1);
+          with FMapData[High(FMapData)] do
+          begin
+            X1 := pan.X div 16;
+            Y1 := pan.Y div 16;
 
-          X2 := (pan.X + pan.Width) div 16;
-          Y2 := (pan.Y + pan.Height) div 16;
+            X2 := (pan.X + pan.Width) div 16;
+            Y2 := (pan.Y + pan.Height) div 16;
 
-          X1 := Trunc(X1/FScale + 0.5);
-          Y1 := Trunc(Y1/FScale + 0.5);
-          X2 := Trunc(X2/FScale + 0.5);
-          Y2 := Trunc(Y2/FScale + 0.5);
+            X1 := Trunc(X1/FScale + 0.5);
+            Y1 := Trunc(Y1/FScale + 0.5);
+            X2 := Trunc(X2/FScale + 0.5);
+            Y2 := Trunc(Y2/FScale + 0.5);
 
-          if (X1 <> X2) or (Y1 <> Y2) then
-          begin
-            if X1 = X2 then
-              X2 := X2 + 1;
-            if Y1 = Y2 then
-              Y2 := Y2 + 1;
-          end;
+            if (X1 <> X2) or (Y1 <> Y2) then
+            begin
+              if X1 = X2 then
+                X2 := X2 + 1;
+              if Y1 = Y2 then
+                Y2 := Y2 + 1;
+            end;
 
-          PanelType := pan.PanelType;
+            PanelType := pan.PanelType;
+          end;
         end;
       end;
     end;
+  finally
+    //writeln('freeing map');
+    map.Free();
   end;
-
-  map.Free();
 end;
 
 procedure TGUIMapPreview.ClearMap();