From b992a09c3c44f5ff88f05500323d816870b29851 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 3 May 2017 21:32:01 -0400 Subject: [PATCH] Fixed major quadtree resize bug --- core/assets/maps/maze.png | Bin 2765 -> 2771 bytes core/src/io/anuke/mindustry/Control.java | 2 +- core/src/io/anuke/mindustry/GameState.java | 2 +- core/src/io/anuke/mindustry/World.java | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/assets/maps/maze.png b/core/assets/maps/maze.png index 4143027ff7cb96242e27d366373bb5251b8ee4f6..9b4dbc5aaf76292e58861a68a930ba0d3be81097 100644 GIT binary patch delta 2662 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 U(VVlI(EtDd07*qoM6N<$f?$BQ+yDRo delta 2656 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 GE&M-Py~u3< diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index 926e83e78b..8602fe30f7 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -50,7 +50,7 @@ public class Control extends RendererModule{ public void init(){ Musics.shuffleAll(); - Entities.initPhysics(0, 0, pixsize, pixsize); + Entities.initPhysics(); Entities.setCollider(tilesize, (x, y)->{ return World.solid(x, y); diff --git a/core/src/io/anuke/mindustry/GameState.java b/core/src/io/anuke/mindustry/GameState.java index ae215bb403..fd047ced62 100644 --- a/core/src/io/anuke/mindustry/GameState.java +++ b/core/src/io/anuke/mindustry/GameState.java @@ -58,7 +58,7 @@ public class GameState{ Enemy enemy = null; - if(wave%5 == 0 & pos <= wave/5){ + if(wave%5 == 0 & pos < wave/5){ enemy = new BossEnemy(point); }else if(wave > 3 && pos < amount/2){ enemy = new FastEnemy(point); diff --git a/core/src/io/anuke/mindustry/World.java b/core/src/io/anuke/mindustry/World.java index efe9626ace..4ea2f91c40 100644 --- a/core/src/io/anuke/mindustry/World.java +++ b/core/src/io/anuke/mindustry/World.java @@ -59,6 +59,8 @@ public class World{ } } + Entities.resizeTree(0, 0, pixsize, pixsize); + Generator.generate(id); Pathfind.reset();