diff --git a/src/invui.mpsrc b/src/invui.mpsrc
index 0fbac2e77077f4db39fe48f972ad7c4340fc6a11..3c4a8f06ed00e4508e00ddb11dfcfd87374c18f3 100644 (file)
--- a/src/invui.mpsrc
+++ b/src/invui.mpsrc
function WindowKeyHanler:boolean;\r
\r
implementation\r
function WindowKeyHanler:boolean;\r
\r
implementation\r
- uses vars, CellUI, console, Canvas, utils, craft, furnace, func, items_store, player, keyboard, Items;\r
+\r
+ uses vars, CellUI, console, Canvas, utils, craft, furnace, func, items_store, player, keyboard, Items, ItemsLogic;\r
+\r
const\r
WINDOW_PLAYER_INV=1;\r
WINDOW_DIV_ITEMS=2;\r
const\r
WINDOW_PLAYER_INV=1;\r
WINDOW_DIV_ITEMS=2;\r
for i:=0 to 1 do\r
for j:=0 to 1 do\r
begin\r
for i:=0 to 1 do\r
for j:=0 to 1 do\r
begin\r
- Items.Draw(getCraftInItem(craftid, id), getCraftInSum(craftid, id), x+52+j*18, y+17+i*18, true);\r
+ ItemsLogic.Draw(getCraftInItem(craftid, id), getCraftInSum(craftid, id), x+52+j*18, y+17+i*18, true);\r
id:=id+1;\r
end;\r
\r
id:=id+1;\r
end;\r
\r
- Items.Draw(getCraftOutItem(craftid), getCraftOutSum(craftid), x+108, y+27, true);\r
+ ItemsLogic.Draw(getCraftOutItem(craftid), getCraftOutSum(craftid), x+108, y+27, true);\r
\r
i:=calcScrollBar(52, getImageHeight(fcScrollImg), MAX_FASTCRAFT_OFFSET, getOffset(0));\r
drawimage(fcScrollImg, x+156, y+66+i);\r
\r
i:=calcScrollBar(52, getImageHeight(fcScrollImg), MAX_FASTCRAFT_OFFSET, getOffset(0));\r
drawimage(fcScrollImg, x+156, y+66+i);\r
sum1:=GetWindowInfo(WINDOW_INFO_DIV_SUM1);\r
sum2:=GetWindowInfo(WINDOW_INFO_DIV_SUM2);\r
\r
sum1:=GetWindowInfo(WINDOW_INFO_DIV_SUM1);\r
sum2:=GetWindowInfo(WINDOW_INFO_DIV_SUM2);\r
\r
- Items.Draw(item, (sum1-sum2), x+8, y+8, true);\r
- Items.Draw(item, sum2, x+64, y+8, true);\r
+ ItemsLogic.Draw(item, (sum1-sum2), x+8, y+8, true);\r
+ ItemsLogic.Draw(item, sum2, x+64, y+8, true);\r
\r
i:=calcScrollBar(72, getImageWidth(DivScrollImg), sum1, sum2);\r
\r
\r
i:=calcScrollBar(72, getImageWidth(DivScrollImg), sum1, sum2);\r
\r