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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 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();