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

Sector expansion functional

Browse Source
This commit is contained in:
Anuken
2018-09-21 14:01:00 -04:00
parent fd8f2438fa
commit bee83a3a3e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/io/anuke/mindustry/maps/Sectors.java
View File

@@ -80,8 +80,6 @@ public class Sectors{
* @param expandX spaces in X coordinate to expand, can be negative * @param expandX spaces in X coordinate to expand, can be negative
* @param expandY spaces in Y coordinate to expand, can be negative*/ * @param expandY spaces in Y coordinate to expand, can be negative*/
public boolean expandSector(Sector sector, int expandX, int expandY){ public boolean expandSector(Sector sector, int expandX, int expandY){
sector.width += expandX;
sector.height += expandY;
//remove old sector data to clear things up //remove old sector data to clear things up
for(int x = sector.x; x < sector.x+sector.width; x++){ for(int x = sector.x; x < sector.x+sector.width; x++){
@@ -131,11 +129,9 @@ public class Sectors{
//create *new* tile array //create *new* tile array
Tile[][] newTiles = new Tile[sector.width * sectorSize][sector.height * sectorSize]; Tile[][] newTiles = new Tile[sector.width * sectorSize][sector.height * sectorSize];
world.beginMapLoad(newTiles);
//shift existing tiles to new array //shift existing tiles to new array
for (int x = 0; x < (sector.width - Math.abs(expandX)); x++) { for (int x = 0; x < (sector.width - Math.abs(expandX))*sectorSize; x++) {
for (int y = 0; y < (sector.height - Math.abs(expandY)); y++) { for (int y = 0; y < (sector.height - Math.abs(expandY))*sectorSize; y++) {
Tile tile = world.rawTile(x, y); Tile tile = world.rawTile(x, y);
tile.x = (short)(x + shiftX); tile.x = (short)(x + shiftX);
tile.y = (short)(y + shiftY); tile.y = (short)(y + shiftY);
@@ -143,6 +139,8 @@ public class Sectors{
} }
} }
world.beginMapLoad(newTiles);
//create new tiles //create new tiles
for (int sx = 0; sx < sector.width; sx++) { for (int sx = 0; sx < sector.width; sx++) {
for (int sy = 0; sy < sector.height; sy++) { for (int sy = 0; sy < sector.height; sy++) {