X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fitems_logic.mpsrc;h=84db3342d06b6dc5d9bee8e6a00abe704949010b;hb=4d7cf2ab1e10d9926d03afb5a3f883bcf5312469;hp=6c730f618f5345b68b5aceecc3373ae2a50cdf0f;hpb=1ca2eb4e93db3ede5fefff927b77abcfa3fcf325;p=cavecraft.git

diff --git a/src/items_logic.mpsrc b/src/items_logic.mpsrc
index 6c730f6..84db334 100644
--- a/src/items_logic.mpsrc
+++ b/src/items_logic.mpsrc
@@ -12,7 +12,8 @@ interface
  procedure updateBlock(x, y:integer);
 
 implementation
- uses invui, maps, drop, console, furnace, png3, func, jpeg, mob, vars, bmp, items, chest, inv, player, items_store, particles, worldgen, phy, sign;
+
+  uses invui, maps, drop, console, furnace, png3, func, jpeg, mobs, vars, bmp, chest, inv, player, items_store, particles, worldgen, phy, sign, Blocks;
 
 procedure usebonemeal(block:integer);
  var
@@ -148,7 +149,7 @@ procedure boom(rr,mm,xx,yy:integer);
      begin
       if 30<=random(100) then destroy_block_1(getmap(ix,iy),ix,iy);
       setmap(0,ix,iy);
-      create_particle(7,(ix*16)+8-16,(iy*16)+8-16);
+      Particles.Create(Particles.explosion, (ix * 16) + 8 - 16, (iy * 16) + 8 - 16);
      end;
    end;
   minhp:=minhp/360;
@@ -853,7 +854,7 @@ procedure destroy_block_cr(id, xx, yy:integer);
     begin
      if getBlockColl(block)=0 then
       begin
-       mob.create(M_ZOMBY, x*16, y*16);
+       Mobs.Create(Mobs.zomby, x * 16, y * 16);
        decItem(invcur);
       end;
     end;
@@ -1153,7 +1154,7 @@ procedure fluidLogic(x, y, ifbx, thenbx, ifby, thenby:integer);
    setMap(thenby, x, y+1);
   else
   //Если нижний блок можно уничтожить, то ставим туда копию
-  if getBlockSet(blockYp1) then
+  if Blocks.IsOverlapped(blockYp1) then
    begin
     destroy_block_0(blockYp1, x, y+1);
     setMap(block, x, y+1);
@@ -1164,7 +1165,7 @@ procedure fluidLogic(x, y, ifbx, thenbx, ifby, thenby:integer);
     if blockXm1=ifbx then
      setMap(thenbx, x-1, y);
     else
-    if getBlockSet(blockXm1) then
+    if Blocks.IsOverlapped(blockXm1) then
      begin
       destroy_block_1(blockXm1, x-1, y);
       setMap(block, x-1, y);
@@ -1173,7 +1174,7 @@ procedure fluidLogic(x, y, ifbx, thenbx, ifby, thenby:integer);
     if blockXp1=ifbx then
      setMap(thenbx, x+1, y);
     else
-    if getBlockSet(blockXp1) then
+    if Blocks.IsOverlapped(blockXp1) then
      begin
       destroy_block_1(blockXp1, x+1, y);
       setMap(block, x+1, y);
@@ -1184,7 +1185,7 @@ procedure fluidLogic(x, y, ifbx, thenbx, ifby, thenby:integer);
 procedure updateBlock(x, y:integer);
  const
   GRASS_RND=128;
-  TORCH_RND=128;
+  TORCH_RND=10;
   SPAWN_RND=128;
   SPAWN_RAD=128;
   GENWOOD_RND=1024;
@@ -1202,7 +1203,7 @@ procedure updateBlock(x, y:integer);
   if block=2 then
    begin
     //Трава разрастается при условии что освещение выше чем 3
-    if (getBlockSet(getMap(x, y-1))=false) or (light=0) then
+    if (light = 0) or (Blocks.IsOverlapped(getMap(x, y - 1)) = false) then
      setMap(1, x, y);
     else
     if light>3 then
@@ -1219,7 +1220,7 @@ procedure updateBlock(x, y:integer);
   else
   if block=7 then
    begin
-    if getBlockSet(getMap(x, y+1)) then
+    if Blocks.IsOverlapped(getMap(x, y+1)) then
      begin
       setMap(0, x, y);
       setMap(7, x, y+1);
@@ -1228,7 +1229,7 @@ procedure updateBlock(x, y:integer);
   else
   if block=8 then
    begin
-    if getBlockSet(getMap(x, y+1)) then
+    if Blocks.IsOverlapped(getMap(x, y+1)) then
      begin
       setMap(0, x, y);
       setMap(8, x, y+1);
@@ -1238,7 +1239,7 @@ procedure updateBlock(x, y:integer);
   if block=26 then
    begin
     if random(TORCH_RND)=random(TORCH_RND) then
-     create_particle(2, x*16+4, y*16+4);
+     Particles.Create(Particles.graySmoke, x * 16 + 4, y * 16 + 4);
    end;
   else
   if block=50 then
@@ -1260,7 +1261,7 @@ procedure updateBlock(x, y:integer);
   else
   if block=74 then
    begin
-    if getBlockSet(getMap(x, y-1))=false then
+    if Blocks.IsOverlapped(getMap(x, y-1))=false then
      setMap(1, x, y);
     else
     if light>3 then
@@ -1346,7 +1347,7 @@ procedure updateBlock(x, y:integer);
   if block=105 then
    begin
     if random(TORCH_RND)=random(TORCH_RND) then
-     create_particle(4, x*16+4, y*16+4);
+     Particles.Create(Particles.redSmoke, x * 16 + 4, y * 16 + 4);
    end;
   else
   if (block = 106) or (block = 125) then