X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmodel%2Fblock%2FBlock.kt;h=9669a5378c5f84dbafd7be4a58bc801522f2a3d7;hb=8b34480aaaf0112671d319accff573030079c7b6;hp=4a0c31a4a4fa7e7038284aa5b3b9776412c99c03;hpb=6da6f8b40b6945e0b4e8376f506c43e548918df4;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 4a0c31a..9669a53 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt @@ -16,8 +16,8 @@ sealed class Block { val width: Float get() = 16f - params.collisionMargins.left - params.collisionMargins.right val height: Float get() = 16f - params.collisionMargins.top - params.collisionMargins.bottom - private val spriteWidth: Float get() = 16f - params.spriteMargins.left - params.spriteMargins.right - private val spriteHeight: Float get() = 16f - params.spriteMargins.top - params.spriteMargins.bottom + val spriteWidth: Float get() = 16f - params.spriteMargins.left - params.spriteMargins.right + val spriteHeight: Float get() = 16f - params.spriteMargins.top - params.spriteMargins.bottom private var animation: Array? = null @@ -129,6 +129,7 @@ sealed class Block { data class Slab( override val params: CommonBlockParams, val fullBlockKey: String, + val otherPartBlockKey: String, ): Block() sealed class Fluid: Block() {