diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java index b2b09eee3..e5ebe8d6d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/GamesInProgress.java @@ -103,10 +103,9 @@ public class GamesInProgress { info.slot = slot; Dungeon.preview(info, bundle); - //saves from before 0.4.3c are not supported - if (info.version < ShatteredPixelDungeon.v0_4_3c) { + //saves from before 0.5.0b are not supported + if (info.version < ShatteredPixelDungeon.v0_5_0b) { info = null; - } } catch (IOException e) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index b37739ceb..08630ff9e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -40,10 +40,8 @@ import javax.microedition.khronos.opengles.GL10; public class ShatteredPixelDungeon extends Game { //variable constants for specific older versions of shattered, used for data conversion - //versions older than v0.4.3c are no longer supported, and data from them is ignored - public static final int v0_4_3c = 148; - - public static final int v0_5_0b = 157; + //versions older than v0.5.0b are no longer supported, and data from them is ignored + public static final int v0_5_0b = 159; public static final int v0_6_0b = 185; @@ -51,7 +49,7 @@ public class ShatteredPixelDungeon extends Game { public static final int v0_6_2e = 229; - public static final int v0_6_3 = 241; + public static final int v0_6_3c = 245; public ShatteredPixelDungeon() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index 805a5916f..03aa39baa 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -55,7 +55,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; import com.shatteredpixel.shatteredpixeldungeon.levels.features.Door; import com.shatteredpixel.shatteredpixeldungeon.levels.features.HighGrass; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; -import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special.MassGraveRoom; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -63,7 +62,6 @@ import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTiledVisual; -import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTileSheet; import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.noosa.Game; @@ -287,8 +285,8 @@ public abstract class Level implements Bundlable { version = bundle.getInt( VERSION ); - //saves from before 0.4.3c are not supported - if (version < ShatteredPixelDungeon.v0_4_3c){ + //saves from before 0.5.0b are not supported + if (version < ShatteredPixelDungeon.v0_5_0b){ throw new RuntimeException("old save"); } @@ -339,32 +337,7 @@ public abstract class Level implements Bundlable { collection = bundle.getCollection( CUSTOM_TILES ); for (Bundlable p : collection) { CustomTiledVisual vis = (CustomTiledVisual)p; - //for compatibilities with pre-0.5.0b saves - //extends one of the bones visuals and discards the rest - if (vis instanceof MassGraveRoom.Bones && vis.tileH == 0){ - int cell = vis.tileX + vis.tileY*width; - if (map[cell] == Terrain.EMPTY_SP && - DungeonTileSheet.wallStitcheable(map[cell - width]) && - DungeonTileSheet.wallStitcheable(map[cell - 1])){ - - vis.tileY--; //move top to into the wall - vis.tileW = 1; - vis.tileH = 2; - - while (map[cell+1] == Terrain.EMPTY_SP){ - vis.tileW++; - cell++; - } - while (map[cell+width] == Terrain.EMPTY_SP){ - vis.tileH++; - cell+=width; - } - - customTiles.add(vis); - } - } else { - customTiles.add(vis); - } + customTiles.add(vis); } collection = bundle.getCollection( CUSTOM_WALLS ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index 090ef7682..7103ac057 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -43,7 +43,7 @@ import com.watabou.utils.FileUtils; public class WelcomeScene extends PixelScene { - private static int LATEST_UPDATE = ShatteredPixelDungeon.v0_6_3; + private static int LATEST_UPDATE = ShatteredPixelDungeon.v0_6_3c; @Override public void create() {