X-Git-Url: https://deadsoftware.ru/gitweb?p=cavecraft.git;a=blobdiff_plain;f=src%2Ffunc.mpsrc;h=bce8640e1089e1289ecb8bfd20d74d4e988f5501;hp=5089d0cc60be5a4b483fb3aba90da7b744cd566f;hb=4d7cf2ab1e10d9926d03afb5a3f883bcf5312469;hpb=9115be0a19d5716f33a2e2cba76f3447ce0f4c2f

diff --git a/src/func.mpsrc b/src/func.mpsrc
index 5089d0c..bce8640 100644
--- a/src/func.mpsrc
+++ b/src/func.mpsrc
@@ -4,8 +4,10 @@ interface
  function get_spawn_x:integer;//Возвращает блок по X где должен появиться игрок
  function get_spawn_y:integer;//Возвращает блок по Y где должен появиться игрок
  procedure draw_block(xx,yy:integer);
+(*
  procedure drawSmallItem(item, x, y:integer);
  procedure drawItem(item, sum, x, y:integer; indicator:boolean;);
+*)
  procedure LoadDrawFont(s:string);
  procedure DrawFontTextSpec(str:string; x, y, color:integer; spec:boolean;);
  procedure DrawFontText(str:string; x, y:integer);
@@ -18,7 +20,7 @@ procedure writestr(s:string);
 function readstr:string;
 
 implementation
- uses canvas,imgcolor,jsr75i, vars, safeload,  items,maps, items_store;
+ uses canvas, imgcolor, jsr75i, vars, safeload, Blocks, maps, items_store;
 
 //Загрузка текстуры с автоматическим выбором источника
 function ld_tex(name, path, folder : String) : Image;
@@ -102,6 +104,7 @@ function readstr:string;
     if getmap(get_spawn_x,iy)<>0 then begin get_spawn_y:=(iy-2); break; end;
   end;
 
+(*
  procedure drawSmallItem(item, x, y:integer);
   begin
    if getItemTexType(item)=0 then
@@ -110,6 +113,7 @@ function readstr:string;
    if getItemTexType(item)=1 then
     drawimage(item8[getItemTex(item)], x, y);
   end;
+*)
 
  procedure draw_block(xx,yy:integer);
   begin
@@ -122,9 +126,9 @@ function readstr:string;
     end; else
    if (getmap(xx,yy)=92) or (getmap(xx,yy)=93) then
     begin
-     if (getBlockSet(getmap(xx-1,yy))=false) and (getBlockSet(getmap(xx+1,yy))=true) then setclip((xx*16)-camx,(yy*16)-camy,10,16); else
-     if (getBlockSet(getmap(xx+1,yy))=false) and (getBlockSet(getmap(xx-1,yy))=true) then setclip((xx*16)-camx+6,(yy*16)-camy,10,16); else
-     if (getBlockSet(getmap(xx+1,yy))=true) and (getBlockSet(getmap(xx-1,yy))=true) then setclip((xx*16)-camx+6,(yy*16)-camy,4,16);
+     if (Blocks.IsOverlapped(getmap(xx - 1, yy)) = false) and (Blocks.IsOverlapped(getmap(xx + 1, yy)) = true) then setclip((xx*16)-camx,(yy*16)-camy,10,16); else
+     if (Blocks.IsOverlapped(getmap(xx + 1, yy)) = false) and (Blocks.IsOverlapped(getmap(xx - 1, yy)) = true) then setclip((xx*16)-camx+6,(yy*16)-camy,10,16); else
+     if (Blocks.IsOverlapped(getmap(xx + 1, yy)) = true) and (Blocks.IsOverlapped(getmap(xx - 1, yy)) = true) then setclip((xx*16)-camx+6,(yy*16)-camy,4,16);
      drawimage(tex[getBlockTex(getmap(xx,yy))],(xx*16)-camx,(yy*16)-camy);
      setclip(0,0,getwidth,getheight);
     end; else
@@ -166,6 +170,7 @@ function readstr:string;
     drawimage(tex[getBlockTex(getmap(xx,yy))],(xx*16)-camx,(yy*16)-camy);
   end;
 
+(*
  procedure drawItem(item, sum, x, y:integer; indicator:boolean;);
   var
    pa_xo,ugol:integer;
@@ -213,7 +218,7 @@ function readstr:string;
       drawfonttext(''+sum, x, y+8);
     end;
   end;
-
+*)
 
 //Загрузка шрифта из файла под именем s
 procedure LoadDrawFont(s:string);