X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=afebce7e17d4fca5dfa47f476d0865600ef9fa90;hb=dc9a52bb70e79e18ad014ce777029bb8ee1d85c4;hp=4df78ad7533548aa4f98f97f29404278a35ba7df;hpb=130ece9b593583c9f274da5d517c7bda10bf6cd4;p=d2df-sdl.git

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 4df78ad..afebce7 100644
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$MODE DELPHI}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_weapons;
 
 interface
@@ -45,8 +45,11 @@ type
     TextureID: DWORD;
     Timeout: DWORD;
     Stopped: Byte;
+
+    procedure positionChanged (); //WARNING! call this after monster position was changed, or coldet will not work right!
   end;
 
+
 var
   Shots: array of TShot = nil;
   LastShotID: Integer = 0;
@@ -88,6 +91,8 @@ procedure g_Weapon_DestroyShot(I: Integer; X, Y: Integer; Loud: Boolean = True);
 procedure g_Weapon_SaveState(var Mem: TBinMemoryWriter);
 procedure g_Weapon_LoadState(var Mem: TBinMemoryReader);
 
+procedure g_Weapon_AddDynLights();
+
 const
   WEAPON_KASTET         = 0;
   WEAPON_SAW            = 1;
@@ -114,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;
@@ -143,7 +148,7 @@ const
 
   SHOT_FLAME_WIDTH = 4;
   SHOT_FLAME_HEIGHT = 4;
-  SHOT_FLAME_LIFETIME = 180; 
+  SHOT_FLAME_LIFETIME = 180;
 
   SHOT_SIGNATURE = $544F4853; // 'SHOT'
 
@@ -238,68 +243,97 @@ 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, chkTrap_mn)) and (i2 < 1023) then //FIXME
+    begin
+      i2 += 1;
+      chkTrap_mn[i2] := monidx;
+    end;
+  end;
+  }
+
+  function monsWaterCheck (monidx: Integer; mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    if (mon.trapCheckFrameId <> frameId) then
+    begin
+      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();
 
-  SetLength(pl, 1024);
-  SetLength(mn, 1024);
-  for d := 0 to 1023 do pl[d] := $FFFF;
-  for d := 0 to 1023 do mn[d] := $FFFF;
+  //i1 := -1;
+  //i2 := -1;
+
+  //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;
 
-        if gMonsters <> nil then
-        begin
-          for d := 0 to High(gMonsters) do
-            if (gMonsters[d] <> nil) and (gMonsters[d].Live) then
-              if gMonsters[d].Collide(gWater[WaterMap[a][c]]) then
-                if not InWArray(d, mn) then
-                  if i2 < 1023 then
-                  begin
-                    i2 := i2+1;
-                    mn[i2] := d;
-                  end;
-        end;
+        //g_Mons_ForEach(monsWaterCheck);
+        g_Mons_ForEachAtAlive(pan.X, pan.Y, pan.Width, pan.Height, monsWaterCheck);
       end;
 
-      if i1 <> -1 then
-        for d := 0 to i1 do
-          gPlayers[pl[d]].Damage(dm, Shots[ID].SpawnerUID, 0, 0, t);
-
-      if i2 <> -1 then
-        for d := 0 to i2 do
-          gMonsters[mn[d]].Damage(dm, 0, 0, Shots[ID].SpawnerUID, t);
+      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;
@@ -312,9 +346,9 @@ begin
   tt := g_GetUIDType(SpawnerUID);
   if tt = UID_MONSTER then
   begin
-    mon := g_Monsters_Get(SpawnerUID);
+    mon := g_Monsters_ByUID(SpawnerUID);
     if mon <> nil then
-      mt := g_Monsters_Get(SpawnerUID).MonsterType
+      mt := g_Monsters_ByUID(SpawnerUID).MonsterType
     else
       mt := 0;
   end
@@ -372,7 +406,7 @@ begin
   if (p.UID = SpawnerUID) and (t <> HIT_ROCKET) and (t <> HIT_ELECTRO) then
     Exit;
 
-  if g_Game_IsServer then 
+  if g_Game_IsServer then
   begin
     if (t <> HIT_FLAME) or (p.FFireTime = 0) or (vx <> 0) or (vy <> 0) then
       p.Damage(d, SpawnerUID, vx, vy, t);
@@ -385,6 +419,30 @@ end;
 
 function GunHit(X, Y: Integer; vx, vy: Integer; dmg: Integer;
   SpawnerUID: Word; AllowPush: Boolean): Byte;
+
+  {function monsCheck (monidx: Integer; mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    if mon.Live and mon.Collide(X, Y) then
+    begin
+      if HitMonster(mon, dmg, vx*10, vy*10-3, SpawnerUID, HIT_SOME) then
+      begin
+        if AllowPush then mon.Push(vx, vy);
+        result := true;
+      end;
+    end;
+  end;}
+
+  function monsCheck (monidx: Integer; mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    if HitMonster(mon, dmg, vx*10, vy*10-3, SpawnerUID, HIT_SOME) then
+    begin
+      if AllowPush then mon.Push(vx, vy);
+      result := true;
+    end;
+  end;
+
 var
   i, h: Integer;
 begin
@@ -403,20 +461,30 @@ begin
 
   if Result <> 0 then Exit;
 
-  h := High(gMonsters);
+  //if g_Mons_ForEach(monsCheck) then result := 2;
+  if g_Mons_ForEachAtAlive(X, Y, 1, 1, monsCheck) then result := 2;
+end;
 
-  if h <> -1 then
-    for i := 0 to h do
-      if (gMonsters[i] <> nil) and gMonsters[i].Live and gMonsters[i].Collide(X, Y) then
-        if HitMonster(gMonsters[i], dmg, vx*10, vy*10-3, SpawnerUID, HIT_SOME) then
+procedure g_Weapon_BFG9000(X, Y: Integer; SpawnerUID: Word);
+
+  function monsCheck (monidx: Integer; mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    if (mon <> nil) and (mon.Live) and (mon.UID <> SpawnerUID) then
+    begin
+      with mon do
+      begin
+        if (g_PatchLength(X, Y, Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2),
+                                Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)) <= SHOT_BFG_RADIUS) and
+            g_TraceVector(X, Y, Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2),
+                                Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)) then
         begin
-          if AllowPush then gMonsters[i].Push(vx, vy);
-          Result := 2;
-          Exit;
+          if HitMonster(mon, 50, 0, 0, SpawnerUID, HIT_SOME) then mon.BFGHit();
         end;
-end;
+      end;
+    end;
+  end;
 
-procedure g_Weapon_BFG9000(X, Y: Integer; SpawnerUID: Word);
 var
   i, h: Integer;
   st: Byte;
@@ -465,17 +533,7 @@ begin
               gPlayers[i].BFGHit();
           end;
 
-  h := High(gMonsters);
-
-  if h <> -1 then
-    for i := 0 to h do
-      if (gMonsters[i] <> nil) and (gMonsters[i].Live) and (gMonsters[i].UID <> SpawnerUID) then
-        with gMonsters[i] do
-          if (g_PatchLength(X, Y, Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2),
-                            Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)) <= SHOT_BFG_RADIUS) and
-              g_TraceVector(X, Y, Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2),
-                            Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)) then
-            if HitMonster(gMonsters[i], 50, 0, 0, SpawnerUID, HIT_SOME) then gMonsters[i].BFGHit();
+  g_Mons_ForEach(monsCheck);
 end;
 
 function g_Weapon_CreateShot(I: Integer; ShotType: Byte; Spawner, TargetUID: Word; X, Y, XV, YV: Integer): LongWord;
@@ -689,7 +747,7 @@ begin
   Shots[i].Stopped := 0;
   if Shots[i].ShotType in [WEAPON_ROCKETLAUNCHER, WEAPON_BFG] then
     Shots[i].Timeout := 900 // ~25 sec
-  else 
+  else
   begin
     if Shots[i].ShotType = WEAPON_FLAMETHROWER then
       Shots[i].Timeout := SHOT_FLAME_LIFETIME
@@ -725,8 +783,9 @@ var
           if ChkTeam then
             if HitPlayer(gPlayers[i], d, obj^.Vel.X, obj^.Vel.Y, SpawnerUID, t) then
             begin
-              gPlayers[i].Push((obj^.Vel.X+obj^.Accel.X)*IfThen(t = HIT_BFG, 8, 1) div 4,
-                               (obj^.Vel.Y+obj^.Accel.Y)*IfThen(t = HIT_BFG, 8, 1) div 4);
+              if t <> HIT_FLAME then
+                gPlayers[i].Push((obj^.Vel.X+obj^.Accel.X)*IfThen(t = HIT_BFG, 8, 1) div 4,
+                                 (obj^.Vel.Y+obj^.Accel.Y)*IfThen(t = HIT_BFG, 8, 1) div 4);
               if t = HIT_BFG then
                 g_Game_DelayEvent(DE_BFGHIT, 1000, SpawnerUID);
               Result := True;
@@ -734,24 +793,29 @@ var
             end;
         end;
   end;
-  function MonsterHit(): Boolean;
-  var
-    i: Integer;
-  begin
-    Result := False;
-    h := High(gMonsters);
 
-    if h <> -1 then
-      for i := 0 to h do
-        if (gMonsters[i] <> nil) and gMonsters[i].Live and g_Obj_Collide(obj, @gMonsters[i].Obj) then
-          if HitMonster(gMonsters[i], d, obj^.Vel.X, obj^.Vel.Y, SpawnerUID, t) then
-          begin
-            gMonsters[i].Push((obj^.Vel.X+obj^.Accel.X)*IfThen(t = HIT_BFG, 8, 1) div 4,
+  function monsCheckHit (monidx: Integer; mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    if (mon <> nil) and mon.Live and g_Obj_Collide(obj, @mon.Obj) then
+    begin
+      if HitMonster(mon, d, obj^.Vel.X, obj^.Vel.Y, SpawnerUID, t) then
+      begin
+        if (t <> HIT_FLAME) then
+        begin
+          mon.Push((obj^.Vel.X+obj^.Accel.X)*IfThen(t = HIT_BFG, 8, 1) div 4,
                               (obj^.Vel.Y+obj^.Accel.Y)*IfThen(t = HIT_BFG, 8, 1) div 4);
-            Result := True;
-            break;
-          end;
+        end;
+        result := True;
+      end;
+    end;
+  end;
+
+  function MonsterHit(): Boolean;
+  begin
+    result := g_Mons_ForEach(monsCheckHit);
   end;
+
 begin
   Result := 0;
 
@@ -840,15 +904,51 @@ begin
 
   case g_GetUIDType(UID) of
     UID_PLAYER: Result := HitPlayer(g_Player_Get(UID), d, 0, 0, SpawnerUID, t);
-    UID_MONSTER: Result := HitMonster(g_Monsters_Get(UID), d, 0, 0, SpawnerUID, t);
+    UID_MONSTER: Result := HitMonster(g_Monsters_ByUID(UID), d, 0, 0, SpawnerUID, t);
     else Exit;
   end;
 end;
 
 function g_Weapon_Explode(X, Y: Integer; rad: Integer; SpawnerUID: Word): Boolean;
 var
-  i, h, r, dx, dy, m, mm: Integer;
+  r: Integer;
+
+  function monsExCheck (monidx: Integer; mon: TMonster): Boolean;
+  var
+    dx, dy, mm: Integer;
+  begin
+    result := false; // don't stop
+    if mon <> nil then
+    begin
+      with mon do
+      begin
+        dx := Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2)-X;
+        dy := Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)-Y;
+
+        if dx > 1000 then dx := 1000;
+        if dy > 1000 then dy := 1000;
+
+        if (dx*dx+dy*dy < r) then
+        begin
+          //m := PointToRect(X, Y, Obj.X+Obj.Rect.X, Obj.Y+Obj.Rect.Y, Obj.Rect.Width, Obj.Rect.Height);
+
+          mm := Max(abs(dx), abs(dy));
+          if mm = 0 then mm := 1;
+
+          if mon.Live then
+            HitMonster(mon, ((mon.Obj.Rect.Width div 4)*10*(rad-mm)) div rad,
+                       0, 0, SpawnerUID, HIT_ROCKET);
+
+          mon.Push((dx*7) div mm, (dy*7) div mm);
+        end;
+      end;
+    end;
+  end;
+
+var
+  i, h, dx, dy, m, mm: Integer;
   _angle: SmallInt;
+
 begin
   Result := False;
 
@@ -882,34 +982,8 @@ begin
           end;
         end;
 
-  h := High(gMonsters);
+  g_Mons_ForEach(monsExCheck);
 
-  if h <> -1 then
-    for i := 0 to h do
-      if gMonsters[i] <> nil then
-        with gMonsters[i] do
-        begin
-          dx := Obj.X+Obj.Rect.X+(Obj.Rect.Width div 2)-X;
-          dy := Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2)-Y;
-
-          if dx > 1000 then dx := 1000;
-          if dy > 1000 then dy := 1000;
-
-          if dx*dx+dy*dy < r then
-          begin
-            //m := PointToRect(X, Y, Obj.X+Obj.Rect.X, Obj.Y+Obj.Rect.Y,
-            //                 Obj.Rect.Width, Obj.Rect.Height);
-
-            mm := Max(abs(dx), abs(dy));
-            if mm = 0 then mm := 1;
-
-            if gMonsters[i].Live then
-              HitMonster(gMonsters[i], ((gMonsters[i].Obj.Rect.Width div 4)*10*(rad-mm)) div rad,
-                         0, 0, SpawnerUID, HIT_ROCKET);
-
-            gMonsters[i].Push((dx*7) div mm, (dy*7) div mm);
-          end;
-        end;
 
   h := High(gCorpses);
 
@@ -957,6 +1031,7 @@ begin
                                Obj.Y+Obj.Rect.Y+(Obj.Rect.Height div 2), X, Y);
 
             g_Obj_PushA(@Obj, Round(15*(rad-m)/rad), _angle);
+            positionChanged(); // this updates spatial accelerators
           end;
         end;
 end;
@@ -1537,7 +1612,7 @@ begin
     throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
 
     triggers := nil;
-    
+
     g_Frames_Get(FramesID, 'FRAMES_WEAPON_BSPFIRE');
     Animation := TAnimation.Create(FramesID, True, 4);
   end;
@@ -1764,9 +1839,14 @@ begin
              (ShotType <> WEAPON_FLAMETHROWER);
 
       if Stopped = 0 then
-        st := g_Obj_Move(@Obj, False, spl)
+      begin
+        st := g_Obj_Move(@Obj, False, spl);
+      end
       else
+      begin
         st := 0;
+      end;
+      positionChanged(); // this updates spatial accelerators
 
       if WordBool(st and MOVE_FALLOUT) or (Obj.X < -1000) or
         (Obj.X > gMapInfo.Width+1000) or (Obj.Y < -1000) then
@@ -1820,6 +1900,7 @@ begin
                     Anim := TAnimation.Create(TextureID, False, 8);
                     Anim.Blending := False;
                     g_GFX_OnceAnim((Obj.X+32)-58, (Obj.Y+8)-36, Anim);
+                    g_DynLightExplosion((Obj.X+32), (Obj.Y+8), 64, 1, 0, 0);
                     Anim.Free();
                   end;
                 end
@@ -1830,6 +1911,7 @@ begin
                     Anim := TAnimation.Create(TextureID, False, 6);
                     Anim.Blending := False;
                     g_GFX_OnceAnim(cx-64, cy-64, Anim);
+                    g_DynLightExplosion(cx, cy, 64, 1, 0, 0);
                     Anim.Free();
                   end;
                 end;
@@ -1887,6 +1969,7 @@ begin
                 Anim.Blending := False;
                 g_GFX_OnceAnim(cx-16, cy-16, Anim);
                 Anim.Free();
+                g_DynLightExplosion(cx, cy, 32, 0, 0.5, 0.5);
               end;
 
               g_Sound_PlayExAt('SOUND_WEAPON_EXPLODEPLASMA', Obj.X, Obj.Y);
@@ -1971,6 +2054,7 @@ begin
               end;
               g_GFX_OnceAnim(tcx-(Anim.Width div 2), tcy-(Anim.Height div 2), Anim, ONCEANIM_SMOKE);
               Anim.Free();
+              //g_DynLightExplosion(tcx, tcy, 1, 1, 0.8, 0.3);
             end;
           end;
 
@@ -2000,6 +2084,7 @@ begin
                 Anim.Blending := False;
                 g_GFX_OnceAnim(cx-64, cy-64, Anim);
                 Anim.Free();
+                g_DynLightExplosion(cx, cy, 96, 0, 1, 0);
               end;
 
               g_Sound_PlayExAt('SOUND_WEAPON_EXPLODEBFG', Obj.X, Obj.Y);
@@ -2424,4 +2509,42 @@ begin
   end;
 end;
 
+
+procedure g_Weapon_AddDynLights();
+var
+  i: Integer;
+begin
+  if Shots = nil then Exit;
+  for i := 0 to High(Shots) do
+  begin
+    if Shots[i].ShotType = 0 then continue;
+    if (Shots[i].ShotType = WEAPON_ROCKETLAUNCHER) or
+       (Shots[i].ShotType = WEAPON_BARON_FIRE) or
+       (Shots[i].ShotType = WEAPON_MANCUB_FIRE) or
+       (Shots[i].ShotType = WEAPON_SKEL_FIRE) or
+       (Shots[i].ShotType = WEAPON_IMP_FIRE) or
+       (Shots[i].ShotType = WEAPON_CACO_FIRE) or
+       (Shots[i].ShotType = WEAPON_MANCUB_FIRE) or
+       (Shots[i].ShotType = WEAPON_BSP_FIRE) or
+       (Shots[i].ShotType = WEAPON_PLASMA) or
+       (Shots[i].ShotType = WEAPON_BFG) or
+       (Shots[i].ShotType = WEAPON_FLAMETHROWER) or
+       false then
+    begin
+      if (Shots[i].ShotType = WEAPON_PLASMA) then
+        g_AddDynLight(Shots[i].Obj.X+(Shots[i].Obj.Rect.Width div 2), Shots[i].Obj.Y+(Shots[i].Obj.Rect.Height div 2), 128,  0, 0.3, 1, 0.4)
+      else if (Shots[i].ShotType = WEAPON_BFG) then
+        g_AddDynLight(Shots[i].Obj.X+(Shots[i].Obj.Rect.Width div 2), Shots[i].Obj.Y+(Shots[i].Obj.Rect.Height div 2), 128,  0, 1, 0, 0.5)
+      else if (Shots[i].ShotType = WEAPON_FLAMETHROWER) then
+        g_AddDynLight(Shots[i].Obj.X+(Shots[i].Obj.Rect.Width div 2), Shots[i].Obj.Y+(Shots[i].Obj.Rect.Height div 2), 42,  1, 0.8, 0, 0.4)
+      else
+        g_AddDynLight(Shots[i].Obj.X+(Shots[i].Obj.Rect.Width div 2), Shots[i].Obj.Y+(Shots[i].Obj.Rect.Height div 2), 128,  1, 0, 0, 0.4);
+    end;
+  end;
+end;
+
+
+procedure TShot.positionChanged (); begin end;
+
+
 end.