X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmodel%2Fblock%2FBlock.kt;h=4a0c31a4a4fa7e7038284aa5b3b9776412c99c03;hb=fd73b6dd24b9fe55c0bc8f52f8aa1104a5fe3cb0;hp=2411a6352d963823bb921f1a8a741172150fddfb;hpb=d555e8c264aa89967f09aecd37f49c69c936bc1c;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt index 2411a63..4a0c31a 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt @@ -104,6 +104,11 @@ sealed class Block { return this is Slab } + fun isNone(): Boolean { + contract { returns(true) implies (this@Block is None) } + return this is None + } + fun getRectangle(x: Int, y: Int): Rectangle { return Rectangle( /* x = */ x * 16f + params.collisionMargins.left, @@ -113,7 +118,9 @@ sealed class Block { ) } - + data class None( + override val params: CommonBlockParams + ) : Block() data class Normal( override val params: CommonBlockParams, @@ -158,7 +165,6 @@ sealed class Block { @Deprecated(LEGACY_ACCESSOR_DEPRECATION) fun isTransparent() = params.isTransparent @Deprecated(LEGACY_ACCESSOR_DEPRECATION) fun getTexture() = sprite - companion object { private const val LEGACY_ACCESSOR_DEPRECATION = "legacy accessors will be removed" private const val ANIMATION_FRAME_DURATION_MS = 100L