From 2751ca90b48a384619e0dd453153c05828556441 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 3 Nov 2020 13:38:53 -0500
Subject: [PATCH] Removed dynamic terrain

---
 core/assets/bundles/bundle.properties          |  2 +-
 core/src/mindustry/graphics/CacheLayer.java    | 16 +++-------------
 core/src/mindustry/graphics/FloorRenderer.java |  4 ++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ce99462b24..1b5bfb1753 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -20,7 +20,7 @@ gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
 copied = Copied.
-indev.popup = [accent]v6[] is currently in [accent]beta[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- SFX and music are unfinished/missing\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.popup = [accent]v6[] is currently in [accent]beta[].\n[lightgray]This means:[]\n[scarlet]- The campaign is unfinished[]\n- SFX and music are unfinished/missing\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
 indev.notready = This part of the game isn't ready yet
 
 load.sound = Sounds
diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java
index fb771da832..01ef5e5bff 100644
--- a/core/src/mindustry/graphics/CacheLayer.java
+++ b/core/src/mindustry/graphics/CacheLayer.java
@@ -51,7 +51,7 @@ public enum CacheLayer{
             endShader(Shaders.slag);
         }
     },
-    space(2){
+    space{
         @Override
         public void begin(){
             beginShader();
@@ -62,20 +62,10 @@ public enum CacheLayer{
             endShader(Shaders.space);
         }
     },
-    normal(5),
-    walls(3);
+    normal,
+    walls;
 
     public static final CacheLayer[] all = values();
-    /** Capacity multiplier. */
-    public final int capacity;
-
-    CacheLayer(){
-        this(3);
-    }
-
-    CacheLayer(int capacity){
-        this.capacity = capacity;
-    }
 
     public void begin(){
 
diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java
index a3b7ff21c8..3e8d4e1fcb 100644
--- a/core/src/mindustry/graphics/FloorRenderer.java
+++ b/core/src/mindustry/graphics/FloorRenderer.java
@@ -32,7 +32,8 @@ public class FloorRenderer implements Disposable{
 
     /**Queues up a cache change for a tile. Only runs in render loop. */
     public void recacheTile(Tile tile){
-        recacheSet.add(Point2.pack(tile.x / chunksize, tile.y / chunksize));
+        //currently a no-op
+        //recacheSet.add(Point2.pack(tile.x / chunksize, tile.y / chunksize));
     }
 
     public void drawFloor(){
@@ -216,7 +217,6 @@ public class FloorRenderer implements Disposable{
         }
 
         Core.batch = current;
-        cbatch.reserve(layer.capacity * chunksize * chunksize);
         chunk[layer.ordinal()] = cbatch.endCache();
     }