Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2019-05-22 21:07:13 -04:00
parent 80c26606f0 a7852098f1
commit 32adcc3676
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/io/anuke/mindustry/editor/DrawOperation.java
View File

@@ -24,21 +24,23 @@ public class DrawOperation{
public void undo(MapEditor editor){ public void undo(MapEditor editor){
for(int i = array.size - 1; i >= 0; i--){ for(int i = array.size - 1; i >= 0; i--){
long l = array.get(i); updateTile(editor, i);
array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), get(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l))));
set(editor, editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l));
} }
} }
public void redo(MapEditor editor){ public void redo(MapEditor editor){
for(int i = 0; i < array.size; i++){ for(int i = 0; i < array.size; i++){
long l = array.get(i); updateTile(editor, i);
array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), get(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l))));
set(editor, editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l));
} }
} }
short get(Tile tile, byte type){ private void updateTile(MapEditor editor, int i) {
long l = array.get(i);
array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), getTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l))));
setTile(editor, editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l));
}
short getTile(Tile tile, byte type){
if(type == OpType.floor.ordinal()){ if(type == OpType.floor.ordinal()){
return tile.floorID(); return tile.floorID();
}else if(type == OpType.block.ordinal()){ }else if(type == OpType.block.ordinal()){
@@ -53,7 +55,7 @@ public class DrawOperation{
throw new IllegalArgumentException("Invalid type."); throw new IllegalArgumentException("Invalid type.");
} }
void set(MapEditor editor, Tile tile, byte type, short to){ void setTile(MapEditor editor, Tile tile, byte type, short to){
editor.load(() -> { editor.load(() -> {
if(type == OpType.floor.ordinal()){ if(type == OpType.floor.ordinal()){
tile.setFloor((Floor)content.block(to)); tile.setFloor((Floor)content.block(to));