Fix furnace bugs

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt b/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt
index a6915efa0df0f70dda0ecfde3d7cf2e287fa14f0..0265cb053625ffd1920a2b5ddba7602227921e33 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/objects/furnace/Furnace.kt
@@ -94,7 +94,7 @@ class Furnace : Serializable {
 
         }
 
-        if (currentFuel != null && burnProgress >= 1f) {
+        if (currentFuel?.isNone() == false && burnProgress >= 1f) {
             if (canSmelt()) {
                 startBurning()
             } else {

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt b/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt
index faef9939cf0e21c83586b09278786f339b74b793..0a8ddf8e45019d9ec2e84d5b605f6c1de71f333a 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt
@@ -67,7 +67,7 @@ object GameWindowsConfigs {
         const val craftOffsetX = 30f
         const val craftOffsetY = 18f
 
-        const val craftResultOffsetX = 128f
+        const val craftResultOffsetX = 124f
         const val craftResultOffsetY = 36f
     }
 
@@ -90,7 +90,7 @@ object GameWindowsConfigs {
         const val smeltFuelMarginLeft = 56f
         const val smeltFuelMarginTop = 54f
 
-        const val smeltResultOffsetX = 128f
+        const val smeltResultOffsetX = 116f
         const val smeltResultOffsetY = 36f
 
         const val fuelBurnMarginLeft = 56f