X-Git-Url: https://deadsoftware.ru/gitweb?p=cavecraft.git;a=blobdiff_plain;f=src%2FItems.pas;h=48475d5f61fe3eb4179e54ba1b8a24161d4dfa60;hp=9ebb84e18ab21ec96a5fe75aa2663e2d421ffcdf;hb=bddd811f24b5890310e09e93a33600a58db39ec9;hpb=4d7cf2ab1e10d9926d03afb5a3f883bcf5312469

diff --git a/src/Items.pas b/src/Items.pas
index 9ebb84e..48475d5 100644
--- a/src/Items.pas
+++ b/src/Items.pas
@@ -108,7 +108,7 @@ interface
     painting5 = 99;
     painting6 = 100;
     painting7 = 101;
-    reservedBlockItem1 = 102;
+    giftChest = 102;
     vines = 103;
     sign = 104;
     redstoneTorch = 105;
@@ -128,11 +128,11 @@ interface
     glassPlane = 119;
     farmland = 120;
     cake = 121;
-    reservedBlockItem2 = 122;
-    reservedBlockItem3 = 123;
-    reservedBlockItem4 = 124;
-    reservedBlockItem5 = 125;
-    reservedBlockItem6 = 126;
+    wheatBlock = 122;
+    melonStem = 123;
+    pumpkinStem = 124;
+    burningFurnace = 125;
+    reservedBlockItem = 126;
     stick = 127;
     dandelionYellow = 128;
     roseRed = 129;
@@ -251,9 +251,6 @@ interface
 
   function GetOrdinary(i : integer) : integer;
 
-  procedure DrawSmall(id, x, y : integer);
-  procedure Draw(id, sum, x, y : integer; drawIndicator : boolean);
-
 implementation
 
   uses Vars, Func;
@@ -340,37 +337,6 @@ implementation
       countOrdItems := countOrdItems + 1;
     end;
 
-  procedure DrawSmall(id, x, y : integer);
-    begin
-      if GetTextureSource(id) = 0 then DrawImage(Vars.tex8[itex[id]], x, y)
-      else if GetTextureSource(id) = 1 then DrawImage(Vars.item8[itex[id]], x, y)
-    end;
-
-  procedure Draw(id, sum, x, y : integer; drawIndicator : boolean);
-    const
-      maxLength = 15;
-      maxHeight = 14;
-      redLength = 3;
-    var
-      class, len : integer;
-    begin
-      if sum <= 0 then exit;
-
-      if GetTextureSource(id) = 0 then DrawImage(Vars.tex[itex[id]], x, y)
-      else if GetTextureSource(id) = 1 then DrawImage(Vars.item[itex[id]], x, y)
-
-      if drawIndicator and (sum > 1) then begin
-        class := GetIndicatorType(id);
-        if class = numeric then begin
-          Func.DrawFontText('' + sum, x, y + 8)
-        end else if class = line then begin
-          len := sum * maxLength / imax[id];
-          if len <= redLength then SetColor(255, 0, 0) else SetColor(0, 255, 0);
-          DrawLine(x, y + maxHeight, x + len, y + maxHeight);
-        end;
-      end;
-    end;
-
 initialization
   InitItem(none, block, 0, 0, 0, 0, noindicator, false);
   InitItem(dirt, block, 1, 64, 1, 0, numeric, true);
@@ -474,7 +440,7 @@ initialization
   InitItem(painting5, block, 110, 1, 99, 0, numeric, true);
   InitItem(painting6, block, 111, 1, 100, 0, numeric, true);
   InitItem(painting7, block, 112, 1, 101, 0, numeric, true);
-  InitItem(reservedBlockItem1, block, 0, 0, 0, 0, noindicator, false);
+  InitItem(giftChest, block, 113, 64, 102, 0, numeric, true);
   InitItem(vines, block, 114, 64, 103, 0, numeric, true);
   InitItem(sign, block, 98, 16, 104, 1, numeric, true);
   InitItem(redstoneTorch, block, 116, 64, 105, 0, numeric, true);
@@ -494,11 +460,11 @@ initialization
   InitItem(glassPlane, block, 128, 64, 119, 0, numeric, true);
   InitItem(farmland, block, 136, 64, 120, 0, numeric, true);
   InitItem(cake, block, 137, 64, 121, 0, numeric, true);
-  InitItem(reservedBlockItem2, block, 0, 0, 0, 0, noindicator, false);
-  InitItem(reservedBlockItem3, block, 0, 0, 0, 0, noindicator, false);
-  InitItem(reservedBlockItem4, block, 0, 0, 0, 0, noindicator, false);
-  InitItem(reservedBlockItem5, block, 0, 0, 0, 0, noindicator, false);
-  InitItem(reservedBlockItem6, block, 0, 0, 0, 0, noindicator, false);
+  InitItem(wheatBlock, block, 142, 64, 122, 0, numeric, true);
+  InitItem(melonStem, block, 143, 64, 123, 0, numeric, true);
+  InitItem(pumpkinStem, block, 143, 64, 124, 0, numeric, true);
+  InitItem(burningFurnace, block, 134, 64, 125, 0, numeric, true);
+  InitItem(reservedBlockItem, block, 0, 0, 0, 0, noindicator, false);
   InitItem(stick, orditem, 0, 64, 0, 1, numeric, true);
   InitItem(dandelionYellow, orditem, 8, 64, 0, 1, numeric, true);
   InitItem(roseRed, orditem, 9, 64, 0, 1, numeric, true);