blocks.cfg -> Blocks.pas

[cavecraft.git] / src / items_logic.mpsrc

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