diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 47de7ab9088588dea8be92a898179ae7c33bc7d5..0b82e18f5343b542edcb69bfeb0f908f2f889233 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
SHOT_FLAME_WIDTH = 4;
SHOT_FLAME_HEIGHT = 4;
- SHOT_FLAME_LIFETIME = 360;
+ SHOT_FLAME_LIFETIME = 180;
SHOT_SIGNATURE = $544F4853; // 'SHOT'
else
Result := True;
if t = HIT_FLAME then
- m.CatchFire();
+ m.CatchFire(SpawnerUID);
end
else
Result := True;
if (t <> HIT_FLAME) or (p.FFireTime = 0) or (vx <> 0) or (vy <> 0) then
p.Damage(d, SpawnerUID, vx, vy, t);
if (t = HIT_FLAME) then
- p.CatchFire();
+ p.CatchFire(SpawnerUID);
end;
Result := True;
Shots[i].Obj.Accel.Y := 0;
if Shots[i].ShotType in [WEAPON_ROCKETLAUNCHER, WEAPON_BFG] then
Shots[i].Timeout := 900 // ~25 sec
- else if Shots[i].ShotType = WEAPON_FLAMETHROWER then
- Shots[i].Timeout := SHOT_FLAME_LIFETIME
- else
- Shots[i].Timeout := 550 // ~15 sec
+ else
+ begin
+ if Shots[i].ShotType = WEAPON_FLAMETHROWER then
+ Shots[i].Timeout := SHOT_FLAME_LIFETIME
+ else
+ Shots[i].Timeout := 550; // ~15 sec
+ end;
end;
function g_Weapon_Hit(obj: PObj; d: Integer; SpawnerUID: Word; t: Byte; HitCorpses: Boolean = True): Byte;
dx := IfThen(xd > x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_ROCKETLAUNCHER;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 12);
Animation := nil;
triggers := nil;
- ShotType := WEAPON_ROCKETLAUNCHER;
g_Texture_Get('TEXTURE_WEAPON_ROCKET', TextureID);
end;
dx := -(Obj.Rect.Width div 2);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_SKEL_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 12);
triggers := nil;
- ShotType := WEAPON_SKEL_FIRE;
target := TargetUID;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_SKELFIRE');
Animation := TAnimation.Create(FramesID, True, 5);
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_PLASMA;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_PLASMA;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_PLASMA');
Animation := TAnimation.Create(FramesID, True, 5);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_FLAMETHROWER;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_FLAMETHROWER;
Animation := nil;
TextureID := 0;
Stopped := 0;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_IMP_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_IMP_FIRE;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_IMPFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_CACO_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_CACO_FIRE;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_CACOFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_BARON_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_BARON_FIRE;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_BARONFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_BSP_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_BSP_FIRE;
+
g_Frames_Get(FramesID, 'FRAMES_WEAPON_BSPFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_MANCUB_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_MANCUB_FIRE;
+
g_Frames_Get(FramesID, 'FRAMES_WEAPON_MANCUBFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_BFG;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_BFG;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_BFG');
Animation := TAnimation.Create(FramesID, True, 6);
end;
ShotType := 0;
end;
- if g_Frames_Get(_id, 'FRAMES_FLAME') then
+ if g_Frames_Get(_id, 'FRAMES_FLAME') and (gTime mod 2 = 0) then
begin
Anim := TAnimation.Create(_id, False, 2 + Random(2));
Anim.Alpha := 0;