From d42f89577354ea24b0f2457341be6614cebc3895 Mon Sep 17 00:00:00 2001
From: dpethes <dejvu@email.cz>
Date: Mon, 15 Jun 2020 14:13:51 +0200
Subject: [PATCH] terrain viewer: plug some more memleaks

---
 terrain_viewer/terrain_mesh.pas   | 10 ++++++----
 terrain_viewer/terrain_viewer.lpi |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/terrain_viewer/terrain_mesh.pas b/terrain_viewer/terrain_mesh.pas
index 61cd2a5..33e4d36 100644
--- a/terrain_viewer/terrain_mesh.pas
+++ b/terrain_viewer/terrain_mesh.pas
@@ -175,10 +175,10 @@ begin
   //init uv coords. block_texcoords is quite pessimistic
   SetLength(block_texcoords, VerticesPerBlock * terrain.TileHeight * terrain.TileWidth);
   for blk := 0 to Length(block_texcoords) div VerticesPerBlock - 1 do
-  for y := 0 to 4 do
-      for x := 0 to 4 do begin
-          block_texcoords[blk*25 + y * 5 + x].init(x/4, 1 - y/4);  //u, v
-      end;
+      for y := 0 to 4 do
+          for x := 0 to 4 do begin
+              block_texcoords[blk*VerticesPerBlock + y * 5 + x].init(x/4, 1 - y/4);  //u, v
+          end;
 end;
 
 destructor TTerrainMesh.Destroy;
@@ -191,7 +191,9 @@ begin
       freemem(render_batches[i].normals);
       freemem(render_batches[i].face_indices);
   end;
+  block_texcoords := nil;
   render_batches := nil;
+  blocks := nil;
   terrain.Free;
 end;
 
diff --git a/terrain_viewer/terrain_viewer.lpi b/terrain_viewer/terrain_viewer.lpi
index 56acab3..ef1c37a 100644
--- a/terrain_viewer/terrain_viewer.lpi
+++ b/terrain_viewer/terrain_viewer.lpi
@@ -130,6 +130,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
+        <UseHeaptrc Value="True"/>
         <TrashVariables Value="True"/>
       </Debugging>
     </Linking>