mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-20 04:37:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some block renderer and editor crashes

Browse Source
This commit is contained in:
Anuken
2018-01-20 23:12:25 -05:00
parent f8514a0f3d
commit 33dafa77d8
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/graphics/BlockRenderer.java
View File

@ -246,6 +246,10 @@ public class BlockRenderer{
} }
void cacheChunk(int cx, int cy, boolean floor){ void cacheChunk(int cx, int cy, boolean floor){
if(cbatch == null){
createBatch();
}
cbatch.begin(); cbatch.begin();
Graphics.useBatch(cbatch); Graphics.useBatch(cbatch);
@ -268,6 +272,10 @@ public class BlockRenderer{
public void clearTiles(){ public void clearTiles(){
cache = null; cache = null;
createBatch();
}
private void createBatch(){
if(cbatch != null) if(cbatch != null)
cbatch.dispose(); cbatch.dispose();
cbatch = new CacheBatch(Vars.world.width() * Vars.world.height() * 4); cbatch = new CacheBatch(Vars.world.width() * Vars.world.height() * 4);

4
core/src/io/anuke/mindustry/mapeditor/DrawOperation.java
View File

@ -17,11 +17,11 @@ public class DrawOperation implements Disposable{
} }
public void undo() { public void undo() {
pixmap.drawPixmap(from, 0, 0); if(from != null) pixmap.drawPixmap(from, 0, 0);
} }
public void redo() { public void redo() {
pixmap.drawPixmap(to, 0, 0); if(to != null) pixmap.drawPixmap(to, 0, 0);
} }
@Override @Override