X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Frender%2Fwindows%2FCreativeWindowRenderer.kt;h=d9423ff2ce8c5381c379e5bc8e4813ed6e13a5be;hb=409a22b3fe7c43b7f686f33cc2f01b6277edec78;hp=3480e2783f9fb12c5d26ede452ede14a11da8fc1;hpb=fd73b6dd24b9fe55c0bc8f52f8aa1104a5fe3cb0;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt b/core/src/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt
index 3480e27..d9423ff 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt
@@ -32,7 +32,7 @@ class CreativeWindowRenderer @Inject constructor(
         val startIndex = gameInput.creativeScroll * CreativeWindowConfig.itemsInRow
         val endIndex = startIndex + CreativeWindowConfig.itemsOnPage
 
-        for (i in startIndex ..< endIndex) {
+        for (i in startIndex..<endIndex) {
             if (i !in allItems.indices) {
                 break
             }
@@ -51,21 +51,25 @@ class CreativeWindowRenderer @Inject constructor(
         }
     }
 
-    private fun drawPlayerInventory(spriteBatch: SpriteBatch, inventoryX: Float, inventoryY: Float) {
+    private fun drawPlayerInventory(
+        spriteBatch: SpriteBatch,
+        shapeRenderer: ShapeRenderer,
+        inventoryX: Float,
+        inventoryY: Float
+    ) {
         mobsController.player.inventory.asSequence()
-            .map(InventoryItem::item)
             .forEachIndexed { index, item ->
-                if (item.isNone()) {
+                if (item.item.isNone()) {
                     return@forEachIndexed
                 }
 
                 val itemX = inventoryX + index * CreativeWindowConfig.itemsGridColWidth
 
-                spriteBatch.draw(item.sprite, itemX, inventoryY)
+                item.draw(spriteBatch, shapeRenderer, itemX, inventoryY)
             }
     }
 
-    private fun drawCreative(spriteBatch: SpriteBatch, viewport: Rectangle) {
+    private fun drawCreative(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle) {
         val creativeWindow = creativeWindowTexture
 
         val windowX = viewport.width / 2 - creativeWindow.regionWidth / 2
@@ -88,13 +92,14 @@ class CreativeWindowRenderer @Inject constructor(
 
         drawPlayerInventory(
             spriteBatch = spriteBatch,
+            shapeRenderer = shapeRenderer,
             inventoryX = windowX + CreativeWindowConfig.itemsGridMarginLeft,
             inventoryY = windowY + creativeWindow.regionHeight - CreativeWindowConfig.playerInventoryOffsetFromBottom
         )
     }
 
     override fun draw(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle, delta: Float) {
-            drawCreative(spriteBatch, viewport)
+        drawCreative(spriteBatch, shapeRenderer, viewport)
     }
 
     companion object {