X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmodel%2Fblock%2FBlock.kt;h=798e3d9b8bfe3e5506de866b4c6e06215cbfaaf5;hb=1c004c0ce7e183e773b5b486295c25e39732e899;hp=45363440e290fad732955cddb78424b7c2e6c01f;hpb=63ffd8af5e9788f36fc75b6d5c29ae525eb74692;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 4536344..798e3d9 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt
@@ -26,7 +26,7 @@ sealed class Block {
         }
 
     val sprite: Sprite
-        get() = requireNotNull(_sprite)
+        get() = requireNotNull(_sprite) { "null sprite for block '${params.key}'" }
 
     private val currentAnimationFrame: Int
         get() {
@@ -115,14 +115,18 @@ sealed class Block {
         val fullBlockKey: String,
     ): Block()
 
-    sealed class Fluid: Block()
+    sealed class Fluid: Block() {
+        abstract val state: Int
+    }
     
     data class Water(
         override val params: CommonBlockParams,
+        override val state: Int,
     ) : Fluid()
 
     data class Lava(
         override val params: CommonBlockParams,
+        override val state: Int,
     ) : Fluid()
 
     /* Legacy accessors below */