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

[cavecraft.git] / src / furnace.mpsrc

diff --git a/src/furnace.mpsrc b/src/furnace.mpsrc
index 7b37737a908d16f9bdad203f2c6b188b8459d6d3..1cf918517708833839b6c11d2f63fa30883dbf84 100644 (file)
--- a/src/furnace.mpsrc
+++ b/src/furnace.mpsrc
@@ -43,7 +43,7 @@ interface
  procedure ResetData;\r
 \r
 implementation\r
- uses maps, drop, items_store, items, jsr75i, func;\r
+ uses maps, drop, items_store, jsr75i, func, Items;\r
 \r
  var\r
   furnace_b: array [0..MAX_FURNACE] of boolean;\r
@@ -265,9 +265,9 @@ implementation
    sumOUT:=GetFurSum(FURNACE_OUT, i);\r
    recipeOUT:=GetReceptOut(itemIN);\r
 \r
-   if (itemIN<>0) and (recipeOUT<>FURNACE_ERROR) then\r
-   if (itemOUT=0) or ((itemOUT=recipeOUT) and (sumOUT<getItemMax(itemOUT))) then\r
-    canUpdate:=true;\r
+   if (itemIN <> 0) and (recipeOUT <> FURNACE_ERROR) then\r
+     if (itemOUT = 0) or ((itemOUT = recipeOUT) and (sumOUT < Items.GetMaximum(itemOUT))) then\r
+       canUpdate := true;\r
   end;\r
 \r
  function furnaceBurn(i:integer):boolean;\r
@@ -291,7 +291,7 @@ implementation
    item:=GetFurItem(FURNACE_FUEL, i);\r
    sum:=GetFurSum(FURNACE_FUEL, i);\r
 \r
-   if getItemDiv(item) then\r
+   if Items.IsDividable(item) then\r
     begin\r
      sum:=sum-1;\r
      if sum<0 then\r
@@ -319,7 +319,7 @@ implementation
    sumOUT:=GetFurSum(FURNACE_OUT, i);\r
    recipeOUT:=GetReceptOut(itemIN);\r
 \r
-   if getItemDiv(itemIN) then\r
+   if Items.IsDividable(itemIN) then\r
     begin\r
      sumIN:=sumIN-1;\r
      if sumIN<0 then\r