X-Git-Url: https://deadsoftware.ru/gitweb?p=cavecraft.git;a=blobdiff_plain;f=src%2Fitems_logic.mpsrc;h=525f02dc3df91513b830952b08f65721292cc45b;hp=84db3342d06b6dc5d9bee8e6a00abe704949010b;hb=bddd811f24b5890310e09e93a33600a58db39ec9;hpb=4d7cf2ab1e10d9926d03afb5a3f883bcf5312469

diff --git a/src/items_logic.mpsrc b/src/items_logic.mpsrc
index 84db334..525f02d 100644
--- a/src/items_logic.mpsrc
+++ b/src/items_logic.mpsrc
@@ -852,7 +852,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=180 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        Mobs.Create(Mobs.zomby, x * 16, y * 16);
        decItem(invcur);
@@ -861,7 +861,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=181 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(2, x*16, y*16);
        decItem(invcur);
@@ -870,7 +870,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=182 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(3, x*16, y*16);
        decItem(invcur);
@@ -1017,7 +1017,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=205 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(4, x*16, y*16);
        decItem(invcur);
@@ -1026,7 +1026,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=206 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(5, x*16, y*16);
        decItem(invcur);
@@ -1035,7 +1035,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=208 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(6, x*16, y*16);
        decItem(invcur);
@@ -1044,7 +1044,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=209 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(7, x*16, y*16);
        decItem(invcur);
@@ -1053,7 +1053,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=213 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(8, x*16, y*16);
        decItem(invcur);
@@ -1062,7 +1062,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
    else
    if item=212 then
     begin
-     if getBlockColl(block)=0 then
+     if Blocks.IsSolid(block) = false then
       begin
        //create_mob(10, x*16, y*16);
        decItem(invcur);
@@ -1404,7 +1404,7 @@ procedure updateBlock(x, y:integer);
     if getmap(x, y+1)<>120 then
      setMap(0, x, y);
 
-    if (info=0) and (getMap(x-1, y)=0) and (getBlockColl(getMap(x-1, y+1))>0) then
+    if (info=0) and (getMap(x-1, y)=0) and Blocks.IsSolid(getMap(x-1, y+1)) then
      setmap(73, x-1, y);
 
     if (getMap(x-1, y)=73) and (getMapinfo(x, y)<>9) then
@@ -1422,7 +1422,7 @@ procedure updateBlock(x, y:integer);
     if getmap(x, y+1)<>120 then
      setMap(0, x, y);
 
-    if (info=0) and (getMap(x-1, y)=0) and (getBlockColl(getMap(x-1, y+1))>0) then
+    if (info=0) and (getMap(x-1, y)=0) and Blocks.IsSolid(getMap(x-1, y+1)) then
      setmap(66, x-1, y);
 
     if (getMap(x-1, y)=66) and (getMapinfo(x, y)<>9) then