X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_monsters.pas;h=018a69359a90fa4598097ea48ad3fc4193454653;hb=ad4f5ec68b851b9b2dba627e3b199b93f529dc86;hp=bd4cd36be433fe2a7ec766052adb2dda140f19c2;hpb=9e2ffed35d5bf49cbfc07c13f8e4a35e24590443;p=d2df-sdl.git

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index bd4cd36..018a693 100644
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -22,7 +22,7 @@ interface
 
 uses
   SysUtils, Classes,
-  {$IFDEF USE_MEMPOOL}mempool,{$ENDIF}
+  mempool,
   g_basic, e_graphics, g_phys, g_textures, g_grid,
   g_saveload, g_panel, xprofiler;
 
@@ -50,6 +50,7 @@ const
 }
 
 type
+  PMonster = ^TMonster;
   TMonster = class{$IFDEF USE_MEMPOOL}(TPoolObject){$ENDIF}
   private
     FMonsterType: Byte;
@@ -272,10 +273,12 @@ function g_Mons_getNewTrapFrameId (): DWord; inline;
 function g_Mons_getNewMPlatFrameId (): LongWord; inline;
 
 
+{
 type
   TMonsAlongLineCB = function (mon: TMonster; tag: Integer): Boolean is nested;
 
 function g_Mons_AlongLine (x0, y0, x1, y1: Integer; cb: TMonsAlongLineCB; log: Boolean=false): TMonster;
+}
 
 
 var
@@ -363,11 +366,13 @@ procedure TMonster.setDirty (); inline; begin mNeedSend := true; end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
+{
 function g_Mons_AlongLine (x0, y0, x1, y1: Integer; cb: TMonsAlongLineCB; log: Boolean=false): TMonster;
 begin
   if not assigned(cb) then begin result := nil; exit; end;
   result := monsGrid.forEachAlongLine(x0, y0, x1, y1, cb, -1, log);
 end;
+}
 
 
 //WARNING! call this after monster position was changed, or coldet will not work right!
@@ -757,6 +762,7 @@ end;
 
 function isCorpse (o: PObj; immediately: Boolean): Integer;
 
+  (*
   function monsCollCheck (mon: TMonster; atag: Integer): Boolean;
   begin
     atag := atag; // shut up, fpc!
@@ -771,10 +777,14 @@ function isCorpse (o: PObj; immediately: Boolean): Integer;
       result := true;
     end;
   end;
+  *)
 
 var
   a: Integer;
-  mon: TMonster;
+  mon: TMonster = nil;
+  pmark: PoolMark;
+  phit: PMonster;
+  hitcount: Integer;
 begin
   result := -1;
 
@@ -784,7 +794,25 @@ begin
   // Èùåì ìåðòâûõ ìîíñòðîâ ïîáëèçîñòè
   if gmon_debug_use_sqaccel then
   begin
-    mon := monsGrid.forEachInAABB(o.X+o.Rect.X, o.Y+o.Rect.Y, o.Rect.Width, o.Rect.Height, monsCollCheck);
+    //mon := monsGrid.forEachInAABB(o.X+o.Rect.X, o.Y+o.Rect.Y, o.Rect.Width, o.Rect.Height, monsCollCheck);
+    //if (mon <> nil) then result := mon.mArrIdx;
+    pmark := framePool.mark();
+    hitcount := monsGrid.forEachInAABB(o.X+o.Rect.X, o.Y+o.Rect.Y, o.Rect.Width, o.Rect.Height);
+    if (hitcount = 0) then exit;
+    phit := PMonster(framePool.getPtr(pmark));
+    while (hitcount > 0) do
+    begin
+      mon := phit^;
+      Inc(phit);
+      Dec(hitcount);
+      case mon.FMonsterType of // Íå âîñêðåñèòü:
+        MONSTER_SOUL, MONSTER_PAIN, MONSTER_CYBER, MONSTER_SPIDER,
+        MONSTER_VILE, MONSTER_BARREL, MONSTER_ROBO: mon := nil;
+        // Îñòàëüíûõ ìîæíî âîñêðåñèòü
+      end;
+      if (mon <> nil) then break;
+    end;
+    framePool.release(pmark);
     if (mon <> nil) then result := mon.mArrIdx;
   end
   else
@@ -4688,21 +4716,36 @@ end;
 
 
 function g_Mons_IsAnyAliveAt (x, y: Integer; width, height: Integer): Boolean;
-
+  (*
   function monsCollCheck (mon: TMonster; atag: Integer): Boolean;
   begin
     result := mon.alive;// and g_Obj_Collide(x, y, width, height, @mon.Obj));
   end;
-
+  *)
 var
   idx: Integer;
   mon: TMonster;
+  pmark: PoolMark;
+  phit: PMonster;
+  hitcount: Integer;
 begin
   result := false;
   if (width < 1) or (height < 1) then exit;
   if gmon_debug_use_sqaccel then
   begin
-    result := (monsGrid.forEachInAABB(x, y, width, height, monsCollCheck) <> nil);
+    //result := (monsGrid.forEachInAABB(x, y, width, height, monsCollCheck) <> nil);
+    pmark := framePool.mark();
+    hitcount := monsGrid.forEachInAABB(x, y, width, height);
+    if (hitcount = 0) then exit;
+    phit := PMonster(framePool.getPtr(pmark));
+    while (hitcount > 0) do
+    begin
+      mon := phit^;
+      Inc(phit);
+      Dec(hitcount);
+      if (mon.alive) then begin result := true; break; end;
+    end;
+    framePool.release(pmark);
   end
   else
   begin
@@ -4723,21 +4766,36 @@ end;
 
 
 function g_Mons_ForEachAt (x, y: Integer; width, height: Integer; cb: TEachMonsterCB): Boolean;
-
+  (*
   function monsCollCheck (mon: TMonster; atag: Integer): Boolean;
   begin
     result := cb(mon);
   end;
-
+  *)
 var
   idx: Integer;
   mon: TMonster;
+  pmark: PoolMark;
+  phit: PMonster;
+  hitcount: Integer;
 begin
   result := false;
   if (width < 1) or (height < 1) then exit;
   if gmon_debug_use_sqaccel then
   begin
-    result := (monsGrid.forEachInAABB(x, y, width, height, monsCollCheck) <> nil);
+    //result := (monsGrid.forEachInAABB(x, y, width, height, monsCollCheck) <> nil);
+    pmark := framePool.mark();
+    hitcount := monsGrid.forEachInAABB(x, y, width, height);
+    if (hitcount = 0) then exit;
+    phit := PMonster(framePool.getPtr(pmark));
+    while (hitcount > 0) do
+    begin
+      mon := phit^;
+      Inc(phit);
+      Dec(hitcount);
+      if (cb(mon)) then begin result := true; break; end;
+    end;
+    framePool.release(pmark);
   end
   else
   begin
@@ -4758,22 +4816,26 @@ end;
 
 
 function g_Mons_ForEachAliveAt (x, y: Integer; width, height: Integer; cb: TEachMonsterCB): Boolean;
-
+  (*
   function monsCollCheck (mon: TMonster; atag: Integer): Boolean;
   begin
     //result := false;
     //if mon.alive and g_Obj_Collide(x, y, width, height, @mon.Obj) then result := cb(mon);
     if mon.alive then result := cb(mon) else result := false;
   end;
-
+  *)
 var
   idx: Integer;
   mon: TMonster;
+  pmark: PoolMark;
+  phit: PMonster;
+  hitcount: Integer;
 begin
   result := false;
   if (width < 1) or (height < 1) then exit;
   if gmon_debug_use_sqaccel then
   begin
+    {
     if (width = 1) and (height = 1) then
     begin
       result := (monsGrid.forEachAtPoint(x, y, monsCollCheck) <> nil);
@@ -4782,6 +4844,22 @@ begin
     begin
       result := (monsGrid.forEachInAABB(x, y, width, height, monsCollCheck) <> nil);
     end;
+    }
+    pmark := framePool.mark();
+    hitcount := monsGrid.forEachInAABB(x, y, width, height);
+    if (hitcount = 0) then exit;
+    phit := PMonster(framePool.getPtr(pmark));
+    while (hitcount > 0) do
+    begin
+      mon := phit^;
+      Inc(phit);
+      Dec(hitcount);
+      if (mon.alive) then
+      begin
+        if (cb(mon)) then begin result := true; break; end;
+      end;
+    end;
+    framePool.release(pmark);
   end
   else
   begin