faster `g_weapons.CheckTrap()`

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index 4a20c4853a01e09aa08920b90785922338a355d9..9f395fdde5dc474ab1ef27649f64d3b6ea88eaef 100644 (file)
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -93,6 +93,7 @@ type
   public
     FNoRespawn: Boolean;
     FFireTime: Integer;
+    trapCheckFrameId: DWord; // for `g_weapons.CheckTrap()`
 
     constructor Create(MonsterType: Byte; aID: Integer; ForcedUID: Integer = -1);
     destructor Destroy(); override;
@@ -195,6 +196,8 @@ function g_Mons_IsAnyAliveAt (x, y: Integer; width, height: Integer): Boolean;
 function g_Mons_ForEachAt (x, y: Integer; width, height: Integer; cb: TEachMonsterCB): Boolean;
 function g_Mons_ForEachAtAlive (x, y: Integer; width, height: Integer; cb: TEachMonsterCB): Boolean;
 
+function g_Mons_getNewTrapFrameId (): DWord;
+
 
 var
   gmon_debug_use_sqaccel: Boolean = true;
@@ -209,6 +212,11 @@ uses
   g_language, g_netmsg, z_aabbtree;
 
 
+// ////////////////////////////////////////////////////////////////////////// //
+var
+  monCheckTrapLastFrameId: DWord;
+
+
 // ////////////////////////////////////////////////////////////////////////// //
 type
   TDynAABBTreeMonsBase = specialize TDynAABBTreeBase<TMonster>;
@@ -484,6 +492,24 @@ begin
 end;
 
 
+function g_Mons_getNewTrapFrameId (): DWord;
+var
+  f: Integer;
+begin
+  Inc(monCheckTrapLastFrameId);
+  if monCheckTrapLastFrameId = 0 then
+  begin
+    // wraparound
+    monCheckTrapLastFrameId := 1;
+    for f := 0 to High(gMonsters) do
+    begin
+      if (gMonsters[f] <> nil) then gMonsters[f].trapCheckFrameId := 0;
+    end;
+  end;
+  result := monCheckTrapLastFrameId;
+end;
+
+
 var
   pt_x: Integer = 0;
   pt_xs: Integer = 1;
@@ -878,6 +904,7 @@ begin
 
   monsTree := TDynAABBTreeMons.Create();
   clearUidMap();
+  monCheckTrapLastFrameId := 0;
 end;
 
 procedure g_Monsters_FreeData();
@@ -1111,6 +1138,7 @@ begin
   monsTree.reset();
   gMonsters := nil;
   clearUidMap();
+  monCheckTrapLastFrameId := 0;
 end;
 
 function g_Monsters_Create(MonsterType: Byte; X, Y: Integer;
@@ -1625,6 +1653,7 @@ begin
 
   treeNode := -1;
   arrIdx := -1;
+  trapCheckFrameId := 0;
 
   if FMonsterType in [MONSTER_ROBO, MONSTER_BARREL] then
     FBloodKind := BLOOD_SPARKS

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index f3accc605fb3ad2cf654c3b8811462cb98139931..afebce7e17d4fca5dfa47f476d0865600ef9fa90 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -119,7 +119,7 @@ const
 implementation
 
 uses
-  Math, g_map, g_player, g_gfx, g_sound, g_main,
+  Math, g_map, g_player, g_gfx, g_sound, g_main, g_panel,
   g_console, SysUtils, g_options, g_game,
   g_triggers, MAPDEF, e_log, g_monsters, g_saveload,
   g_language, g_netmsg;
@@ -243,19 +243,27 @@ begin
   WaterArray := nil;
 end;
 
+
+var
+  chkTrap_pl: array [0..256] of Integer;
+  chkTrap_mn: array [0..65535] of TMonster;
+
 procedure CheckTrap(ID: DWORD; dm: Integer; t: Byte);
 var
-  a, b, c, d, i1, i2: Integer;
-  pl, mn: WArray;
+  //a, b, c, d, i1, i2: Integer;
+  //chkTrap_pl, chkTrap_mn: WArray;
+  plaCount: Integer = 0;
+  mnaCount: Integer = 0;
+  frameId: DWord;
 
   {
   function monsWaterCheck (monidx: Integer; mon: TMonster): Boolean;
   begin
     result := false; // don't stop
-    if mon.Live and mon.Collide(gWater[WaterMap[a][c]]) and (not InWArray(monidx, mn)) and (i2 < 1023) then //FIXME
+    if mon.Live and mon.Collide(gWater[WaterMap[a][c]]) and (not InWArray(monidx, chkTrap_mn)) and (i2 < 1023) then //FIXME
     begin
       i2 += 1;
-      mn[i2] := monidx;
+      chkTrap_mn[i2] := monidx;
     end;
   end;
   }
@@ -263,66 +271,69 @@ var
   function monsWaterCheck (monidx: Integer; mon: TMonster): Boolean;
   begin
     result := false; // don't stop
-    if (not InWArray(monidx, mn)) and (i2 < 1023) then //FIXME
+    if (mon.trapCheckFrameId <> frameId) then
     begin
-      i2 += 1;
-      mn[i2] := monidx;
+      mon.trapCheckFrameId := frameId;
+      chkTrap_mn[mnaCount] := mon;
+      Inc(mnaCount);
     end;
   end;
 
+var
+  a, b, c, d, f: Integer;
+  pan: TPanel;
 begin
   if (gWater = nil) or (WaterMap = nil) then Exit;
 
-  i1 := -1;
-  i2 := -1;
+  frameId := g_Mons_getNewTrapFrameId();
+
+  //i1 := -1;
+  //i2 := -1;
 
-  SetLength(pl, 1024);
-  SetLength(mn, 1024);
-  for d := 0 to 1023 do pl[d] := $FFFF;
-  for d := 0 to 1023 do mn[d] := $FFFF;
+  //SetLength(chkTrap_pl, 1024);
+  //SetLength(chkTrap_mn, 1024);
+  //for d := 0 to 1023 do chkTrap_pl[d] := $FFFF;
+  //for d := 0 to 1023 do chkTrap_mn[d] := $FFFF;
 
   for a := 0 to High(WaterMap) do
+  begin
     for b := 0 to High(WaterMap[a]) do
     begin
-      if not g_Obj_Collide(gWater[WaterMap[a][b]].X, gWater[WaterMap[a][b]].Y,
-                           gWater[WaterMap[a][b]].Width, gWater[WaterMap[a][b]].Height,
-                           @Shots[ID].Obj) then Continue;
+      pan := gWater[WaterMap[a][b]];
+      if not g_Obj_Collide(pan.X, pan.Y, pan.Width, pan.Height, @Shots[ID].Obj) then continue;
 
       for c := 0 to High(WaterMap[a]) do
       begin
-        if gPlayers <> nil then
+        pan := gWater[WaterMap[a][c]];
+        for d := 0 to High(gPlayers) do
         begin
-          for d := 0 to High(gPlayers) do
-            if (gPlayers[d] <> nil) and (gPlayers[d].Live) then
-              if gPlayers[d].Collide(gWater[WaterMap[a][c]]) then
-                if not InWArray(d, pl) then
-                  if i1 < 1023 then
-                  begin
-                    i1 := i1+1;
-                    pl[i1] := d;
-                  end;
+          if (gPlayers[d] <> nil) and (gPlayers[d].Live) then
+          begin
+            if gPlayers[d].Collide(pan) then
+            begin
+              f := 0;
+              while (f < plaCount) and (chkTrap_pl[f] <> d) do Inc(f);
+              if (f = plaCount) then
+              begin
+                chkTrap_pl[plaCount] := d;
+                Inc(plaCount);
+                if (plaCount = Length(chkTrap_pl)) then break;
+              end;
+            end;
+          end;
         end;
 
         //g_Mons_ForEach(monsWaterCheck);
-        g_Mons_ForEachAtAlive(
-          gWater[WaterMap[a][c]].X, gWater[WaterMap[a][c]].Y,
-          gWater[WaterMap[a][c]].Width, gWater[WaterMap[a][c]].Height,
-          monsWaterCheck);
-      end;
-
-      if i1 <> -1 then
-      begin
-        for d := 0 to i1 do gPlayers[pl[d]].Damage(dm, Shots[ID].SpawnerUID, 0, 0, t);
+        g_Mons_ForEachAtAlive(pan.X, pan.Y, pan.Width, pan.Height, monsWaterCheck);
       end;
 
-      if i2 <> -1 then
-      begin
-        for d := 0 to i2 do g_Mons_ByIdx(mn[d]).Damage(dm, 0, 0, Shots[ID].SpawnerUID, t);
-      end;
+      for f := 0 to plaCount-1 do gPlayers[chkTrap_pl[f]].Damage(dm, Shots[ID].SpawnerUID, 0, 0, t);
+      for f := 0 to mnaCount-1 do chkTrap_mn[f].Damage(dm, 0, 0, Shots[ID].SpawnerUID, t);
     end;
+  end;
 
-  pl := nil;
-  mn := nil;
+  //chkTrap_pl := nil;
+  //chkTrap_mn := nil;
 end;
 
 function HitMonster(m: TMonster; d: Integer; vx, vy: Integer; SpawnerUID: Word; t: Byte): Boolean;