X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Factions%2FCommonBlockActionUtils.kt;h=2803ef04e9fbcf21cd9b13a6a8d3f4e991727e1a;hb=476b65903ad1082a1847eb2a8076ab1039358790;hp=43094309395f70e094031f760a0957e458c4ccef;hpb=6a71a9abc5bc34547c0e4bea7ab19a6bee628a3c;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt b/core/src/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt index 4309430..2803ef0 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt @@ -1,22 +1,22 @@ package ru.deadsoftware.cavedroid.game.actions import com.badlogic.gdx.Gdx +import ru.deadsoftware.cavedroid.game.actions.placeblock.IPlaceBlockAction import ru.deadsoftware.cavedroid.game.actions.updateblock.IUpdateBlockAction import ru.deadsoftware.cavedroid.game.actions.updateblock.UpdateRequiresBlockAction -import ru.deadsoftware.cavedroid.game.actions.useitem.IUseItemAction -import ru.deadsoftware.cavedroid.game.actions.useitem.PlaceBlockItemToBackgroundAction -import ru.deadsoftware.cavedroid.game.actions.useitem.PlaceBlockItemToForegroundAction -import ru.deadsoftware.cavedroid.game.objects.Item +import ru.deadsoftware.cavedroid.game.actions.placeblock.PlaceBlockItemToBackgroundAction +import ru.deadsoftware.cavedroid.game.actions.placeblock.PlaceBlockItemToForegroundAction +import ru.deadsoftware.cavedroid.game.model.item.Item private const val TAG = "PlaceBlockActionUtils" -fun Map.placeToForegroundAction(item: Item, x: Int, y: Int) { - get(PlaceBlockItemToForegroundAction.ACTION_KEY)?.perform(item, x, y) +fun Map.placeToForegroundAction(item: Item.Placeable, x: Int, y: Int) { + get(PlaceBlockItemToForegroundAction.ACTION_KEY)?.place(item, x, y) ?: Gdx.app.error(TAG, "action place_foreground_block not found") } -fun Map.placeToBackgroundAction(item: Item, x: Int, y: Int) { - get(PlaceBlockItemToBackgroundAction.ACTION_KEY)?.perform(item, x, y) +fun Map.placeToBackgroundAction(item: Item.Placeable, x: Int, y: Int) { + get(PlaceBlockItemToBackgroundAction.ACTION_KEY)?.place(item, x, y) ?: Gdx.app.error(TAG, "action place_background_block not found") }