New implementation of module Items, *.cfg files now deprecated

[cavecraft.git] / src / cellui.mpsrc

diff --git a/src/cellui.mpsrc b/src/cellui.mpsrc
index 070ea0e18fe99cf453b5fced1e72305e9d8e0304..3b14c3fa68d232e188ccf0ca5323daa5c1d5ac12 100644 (file)
--- a/src/cellui.mpsrc
+++ b/src/cellui.mpsrc
@@ -75,7 +75,7 @@ interface
  function FindCurrentWindowsType:boolean;\r
 \r
 implementation\r
  function FindCurrentWindowsType:boolean;\r
 \r
 implementation\r

- uses vars, Canvas, items, console, furnace, chest, inv, func, items_store;\r
+ uses vars, Canvas, console, furnace, chest, inv, func, items_store, Items;\r

  var\r
   layer:integer;\r
   last_cell: array [0..CONST_MAX_LAYERS] of integer;\r
  var\r
   layer:integer;\r
   last_cell: array [0..CONST_MAX_LAYERS] of integer;\r


@@ -227,7 +227,7 @@ implementation
     getItemIdx:=inv.getItem(id);\r
    else\r
    if _type=CELL_TYPE_CREWATIVE_INV then\r
     getItemIdx:=inv.getItem(id);\r
    else\r
    if _type=CELL_TYPE_CREWATIVE_INV then\r

-    getItemIdx:=getItemList(id);\r
+    getItemIdx:=Items.GetOrdinary(id);\r

    else\r
    if _type=CELL_TYPE_CHEST then\r
     getItemIdx:=chest.getItem(id, data);\r
    else\r
    if _type=CELL_TYPE_CHEST then\r
     getItemIdx:=chest.getItem(id, data);\r


@@ -269,7 +269,7 @@ implementation
     getSumIdx:=inv.getSum(id);\r
    else\r
    if _type=CELL_TYPE_CREWATIVE_INV then\r
     getSumIdx:=inv.getSum(id);\r
    else\r
    if _type=CELL_TYPE_CREWATIVE_INV then\r

-    getSumIdx:=getItemMax(getItemList(id));\r
+    getSumIdx:=Items.GetMaximum(Items.GetOrdinary(id));\r

    else\r
    if _type=CELL_TYPE_CHEST then\r
     getSumIdx:=chest.getSum(id, data);\r
    else\r
    if _type=CELL_TYPE_CHEST then\r
     getSumIdx:=chest.getSum(id, data);\r


@@ -336,7 +336,7 @@ implementation
    for j:=0 to CONST_MAX_CELLS do\r
     if inv_type[i, j]<>CELL_TYPE_NULL then\r
      begin\r
    for j:=0 to CONST_MAX_CELLS do\r
     if inv_type[i, j]<>CELL_TYPE_NULL then\r
      begin\r

-      drawItem(getItemIdx(j, i), getSumIdx(j, i), x+inv_x[i, j], y+inv_y[i, j], getCellFlagIndicator(i, j));\r
+      Items.Draw(getItemIdx(j, i), getSumIdx(j, i), x+inv_x[i, j], y+inv_y[i, j], getCellFlagIndicator(i, j));\r

      end;\r
   end;\r
 \r
      end;\r
   end;\r
 \r