X-Git-Url: https://deadsoftware.ru/gitweb?p=cavecraft.git;a=blobdiff_plain;f=src%2Fcellui.mpsrc;h=3b14c3fa68d232e188ccf0ca5323daa5c1d5ac12;hp=070ea0e18fe99cf453b5fced1e72305e9d8e0304;hb=4d7cf2ab1e10d9926d03afb5a3f883bcf5312469;hpb=9115be0a19d5716f33a2e2cba76f3447ce0f4c2f

diff --git a/src/cellui.mpsrc b/src/cellui.mpsrc
index 070ea0e..3b14c3f 100644
--- a/src/cellui.mpsrc
+++ b/src/cellui.mpsrc
@@ -75,7 +75,7 @@ interface
  function FindCurrentWindowsType:boolean;
 
 implementation
- uses vars, Canvas, items, console, furnace, chest, inv, func, items_store;
+ uses vars, Canvas, console, furnace, chest, inv, func, items_store, Items;
  var
   layer:integer;
   last_cell: array [0..CONST_MAX_LAYERS] of integer;
@@ -227,7 +227,7 @@ implementation
     getItemIdx:=inv.getItem(id);
    else
    if _type=CELL_TYPE_CREWATIVE_INV then
-    getItemIdx:=getItemList(id);
+    getItemIdx:=Items.GetOrdinary(id);
    else
    if _type=CELL_TYPE_CHEST then
     getItemIdx:=chest.getItem(id, data);
@@ -269,7 +269,7 @@ implementation
     getSumIdx:=inv.getSum(id);
    else
    if _type=CELL_TYPE_CREWATIVE_INV then
-    getSumIdx:=getItemMax(getItemList(id));
+    getSumIdx:=Items.GetMaximum(Items.GetOrdinary(id));
    else
    if _type=CELL_TYPE_CHEST then
     getSumIdx:=chest.getSum(id, data);
@@ -336,7 +336,7 @@ implementation
    for j:=0 to CONST_MAX_CELLS do
     if inv_type[i, j]<>CELL_TYPE_NULL then
      begin
-      drawItem(getItemIdx(j, i), getSumIdx(j, i), x+inv_x[i, j], y+inv_y[i, j], getCellFlagIndicator(i, j));
+      Items.Draw(getItemIdx(j, i), getSumIdx(j, i), x+inv_x[i, j], y+inv_y[i, j], getCellFlagIndicator(i, j));
      end;
   end;