X-Git-Url: https://deadsoftware.ru/gitweb?p=cavecraft.git;a=blobdiff_plain;f=src%2Finvui.mpsrc;h=3c4a8f06ed00e4508e00ddb11dfcfd87374c18f3;hp=0fbac2e77077f4db39fe48f972ad7c4340fc6a11;hb=bddd811f24b5890310e09e93a33600a58db39ec9;hpb=4d7cf2ab1e10d9926d03afb5a3f883bcf5312469 diff --git a/src/invui.mpsrc b/src/invui.mpsrc index 0fbac2e..3c4a8f0 100644 --- a/src/invui.mpsrc +++ b/src/invui.mpsrc @@ -10,7 +10,9 @@ interface function WindowKeyHanler:boolean; implementation - uses vars, CellUI, console, Canvas, utils, craft, furnace, func, items_store, player, keyboard, Items; + + uses vars, CellUI, console, Canvas, utils, craft, furnace, func, items_store, player, keyboard, Items, ItemsLogic; + const WINDOW_PLAYER_INV=1; WINDOW_DIV_ITEMS=2; @@ -176,11 +178,11 @@ implementation for i:=0 to 1 do for j:=0 to 1 do begin - Items.Draw(getCraftInItem(craftid, id), getCraftInSum(craftid, id), x+52+j*18, y+17+i*18, true); + ItemsLogic.Draw(getCraftInItem(craftid, id), getCraftInSum(craftid, id), x+52+j*18, y+17+i*18, true); id:=id+1; end; - Items.Draw(getCraftOutItem(craftid), getCraftOutSum(craftid), x+108, y+27, true); + ItemsLogic.Draw(getCraftOutItem(craftid), getCraftOutSum(craftid), x+108, y+27, true); i:=calcScrollBar(52, getImageHeight(fcScrollImg), MAX_FASTCRAFT_OFFSET, getOffset(0)); drawimage(fcScrollImg, x+156, y+66+i); @@ -409,8 +411,8 @@ implementation sum1:=GetWindowInfo(WINDOW_INFO_DIV_SUM1); sum2:=GetWindowInfo(WINDOW_INFO_DIV_SUM2); - Items.Draw(item, (sum1-sum2), x+8, y+8, true); - Items.Draw(item, sum2, x+64, y+8, true); + ItemsLogic.Draw(item, (sum1-sum2), x+8, y+8, true); + ItemsLogic.Draw(item, sum2, x+64, y+8, true); i:=calcScrollBar(72, getImageWidth(DivScrollImg), sum1, sum2);