From d3aa3b4fc12fb6174ec2f2b949791a481fda10a1 Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Tue, 3 Dec 2019 00:19:13 -0800
Subject: [PATCH] Fixed issues with zone pooling

Zone fields are now reset correctly
obtainByteArray and obtainTileArray now clear their data up to required size
---
 core/src/com/riiablo/map/Map.java | 47 +++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/core/src/com/riiablo/map/Map.java b/core/src/com/riiablo/map/Map.java
index 833b9fbd..a75dfec6 100644
--- a/core/src/com/riiablo/map/Map.java
+++ b/core/src/com/riiablo/map/Map.java
@@ -536,7 +536,9 @@ public class Map implements Disposable {
     static DT1.Tile[] obtainTileArray(int size) {
       for (int i = 0; i < sizes.length; i++) {
         if (size <= sizes[i]) {
-          return tilePools[i].obtain();
+          DT1.Tile[] tiles = tilePools[i].obtain();
+          Arrays.fill(tiles, 0, size, null);
+          return tiles;
         }
       }
 
@@ -552,7 +554,11 @@ public class Map implements Disposable {
 
     static byte[] obtainByteArray(int size) {
       for (int i = 0; i < sizes.length; i++) {
-        if (size <= sizes[i] * DT1.Tile.NUM_SUBTILES) return bytePools[i].obtain();
+        if (size <= sizes[i] * DT1.Tile.NUM_SUBTILES) {
+          byte[] bytes = bytePools[i].obtain();
+          Arrays.fill(bytes, 0, size, (byte) 0);
+          return bytes;
+        }
       }
 
       Gdx.app.error(TAG, "Creating custom sized byte array: " + size);
@@ -652,27 +658,38 @@ public class Map implements Disposable {
       return this;
     }
 
+    /**
+     * This is called when zones are cleared before they are disposed -- not when obtained.
+     */
     @Override
-    public void reset() {
-      dt1s = null;
-      flags = null;
-      Arrays.fill(tiles, null);
-      for (Preset[] x : presets) Arrays.fill(x, null);
-      entities = EMPTY_ENTITY_ARRAY;
-      warps = EMPTY_INT_INT_MAP;
-      dependencies = EMPTY_ASSET_ARRAY;
-      generator = EMPTY_GENERATOR;
-      town = false;
-    }
+    public void reset() {}
 
     @Override
     public void dispose() {
+      x = y = 0;
+      width = height = 0;
+      gridSizeX = gridSizeY = 0;
+      gridsX = gridsY = 0;
+      tx = ty = 0;
+      tilesX = tilesY = 0;
+
       free(flags);
+      flags = null;
+
       for (DT1.Tile[] layer : tiles) free(layer);
+      Arrays.fill(tiles, null);
+
       //for (Preset[] x : presets) for (Preset y : x) if (y != null) y.dispose();
-      entities.clear();
-      warps.clear();
+      for (Preset[] x : presets) Arrays.fill(x, null);
+
       for (AssetDescriptor asset : dependencies) Riiablo.assets.unload(asset.fileName);
+      dependencies = EMPTY_ASSET_ARRAY;
+
+      dt1s = null; // TODO: clear this properly -- how?
+      town = false;
+      entities = EMPTY_ENTITY_ARRAY;
+      warps = EMPTY_INT_INT_MAP;
+      generator = EMPTY_GENERATOR;
     }
 
     @Override