hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:580cd247511e
+:5d0704f23a2a
 if Gear^.AmmoType = amDEagle then
 AmmoShove(Gear, 7, 20)
 else
 AmmoShove(Gear, Gear^.Timer, 20);
 CheckGearDrowning(Gear);
-dec(i) until (i = 0) or (Gear^.Damage > Gear^.Health) or ((Gear^.State and gstDrowning) <> 0);
+dec(i)
+until (i = 0) or (Gear^.Damage > Gear^.Health) or ((Gear^.State and gstDrowning) <> 0);
 if Gear^.Damage > 0 then
 begin
 DrawTunnel(oX, oY, Gear^.dX, Gear^.dY, 82 - i, 1);
 dec(Gear^.Health, Gear^.Damage);
 Gear^.Damage := 0
 if Gear^.Health <= 0 then
 exBoom := true;
 end
 else
 begin
-if Gear^.Timer = 0 then
+if Gear^.Timer = 500 then
 begin
 (* Can't make sparkles team coloured without working out what the next team is going to be. This should be solved, really, since it also screws up
 voices. Reinforcements voices is heard for active team, not team-to-be.  Either that or change crate spawn from end of turn to start, although that
 has its own complexities. *)
-sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1);
+// Abuse a couple of gear values to track origin
-if sparkles <> nil then
+Gear^.Angle:= hwRound(Gear^.X);
-begin
+Gear^.Power:= hwRound(Gear^.Y);
-sparkles^.Tint:= $FAB22CFF
+Gear^.Tag:= random(2);
+inc(Gear^.Timer)
+end;
+if Gear^.Timer < 1833 then inc(Gear^.Timer);
+if Gear^.Timer = 1000 then
+begin
+sparkles:= AddVisualGear(Gear^.Angle, Gear^.Power, vgtDust, 1);
+if sparkles <> nil then
+begin
+sparkles^.dX:= 0;
+sparkles^.dY:= 0;
+sparkles^.Angle:= 270;
+if Gear^.Tag = 1 then
+sparkles^.Tint:= $3744D7FF
+else sparkles^.Tint:= $FAB22CFF
+end;
+end;
+if Gear^.Timer < 1000 then
+begin
+AllInactive:= false;
+exit
 end
-end;
-if (GameTicks and $1 = 0) and (Gear^.Timer < 255) then inc(Gear^.Timer)
 end;
 if (Gear^.Damage > 0) or exBoom then
 begin
 x := hwRound(Gear^.X);
 repeat
 CurrentTeam^.CurrHedgehog := Succ(CurrentTeam^.CurrHedgehog) mod (CurrentTeam^.HedgehogsNumber);
 until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) and (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.Damage = 0);
-CurrentHedgehog := @CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog];
+SwitchCurrentHedgehog(@CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog]);
 AmmoMenuInvalidated:= true;
 HHGear := CurrentHedgehog^.Gear;
 HHGear^.State := State;
 HHGear^.Active := true;
 PrevAngle(Gear, dA)
 else
 begin
 Gear^.Tag := 0;
 Gear^.X := Gear^.X + int2hwFloat(xx);
-if not TestCollisionY(Gear, yyn) then
+if TestCollisionYwithGear(Gear, yyn) = 0 then
 begin
 Gear^.Y := Gear^.Y + int2hwFloat(yyn);
 NextAngle(Gear, dA)
 end;
 end;
 begin
 AllInactive := false;
 HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Message := HHGear^.Message and (not gmAttack);
-DeleteCI(HHGear);
+Gear^.CollisionMask:= $FF7F;
-Gear^.IntersectGear:= nil;
 FollowGear := Gear;
 Gear^.doStep := @doStepCakeFall
 end;
 AddGear(gx, gy, gtBall, 0, SignAs(AngleSin(HHGear^.Angle) * _0_8, HHGear^.dX) + rx, AngleCos(HHGear^.Angle) * ( - _0_8) + ry, 0);
 PlaySound(sndGun);
 end;
-if (Gear^.Timer = 0) or (HHGear^.Damage <> 0) then
+if (Gear^.Timer = 0) or ((HHGear^.State and gstHHDriven) = 0) then
 begin
 DeleteGear(Gear);
 AfterAttack
 end
 end;
 if Gear^.Timer < 10000 then
 gear^.RenderTimer := true;
 // abort if there is no other portal connected to this one
-if (Gear^.IntersectGear = nil) then
+if (Gear^.LinkedGear = nil) then
 exit;
-if ((Gear^.IntersectGear^.Tag and 1) = 0) then // or if it's still moving;
+if ((Gear^.LinkedGear^.Tag and 1) = 0) then // or if it's still moving;
 exit;
-conPortal := Gear^.IntersectGear;
+conPortal := Gear^.LinkedGear;
 // check all gears for stuff to port through
 iterator := nil;
 while true do
 begin
 Gear^.DirAngle := DxDy2Angle(-Gear^.dY,Gear^.dX);
 if not Gear^.dX.isNegative then
 Gear^.DirAngle := 180-Gear^.DirAngle;
-if ((Gear^.IntersectGear = nil)
+if ((Gear^.LinkedGear = nil)
-or (hwRound(Distance(Gear^.X - Gear^.IntersectGear^.X,Gear^.Y-Gear^.IntersectGear^.Y)) >=Gear^.Radius*2)) then
+or (hwRound(Distance(Gear^.X - Gear^.LinkedGear^.X,Gear^.Y-Gear^.LinkedGear^.Y)) >=Gear^.Radius*2)) then
 begin
 loadNewPortalBall(Gear, false);
 inc(Gear^.Tag);
 Gear^.doStep := @doStepPortal;
 end
 // to the scaler)
 s := (_2 * s + (newPortal^.dX * CurrentHedgehog^.Gear^.dX + newPortal^.dY * CurrentHedgehog^.Gear^.dY ) / s) / s;
 newPortal^.dX := newPortal^.dX * s;
 newPortal^.dY := newPortal^.dY * s;
-newPortal^.IntersectGear := nil;
+newPortal^.LinkedGear := nil;
 if CurrentHedgehog <> nil then
 with CurrentHedgehog^ do
 begin
 CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
 iterator^.Timer:= 0;
 end
 else
 begin
 // link portals with each other
-newPortal^.IntersectGear := iterator;
+newPortal^.LinkedGear := iterator;
-iterator^.IntersectGear := newPortal;
+iterator^.LinkedGear := newPortal;
 iterator^.Health := newPortal^.Health;
 end;
 end;
 iterator^.PortalCounter:= 0;
 iterator := iterator^.NextGear
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepFlamethrowerWork(Gear: PGear);
 var
-HHGear: PGear;
+HHGear, flame: PGear;
 rx, ry, speed: hwFloat;
 i, gX, gY: LongInt;
 begin
 AllInactive := false;
 HHGear := Gear^.Hedgehog^.Gear;
 begin
 rx := rndSign(getRandomf * _0_1);
 ry := rndSign(getRandomf * _0_1);
 speed := _0_5 * (_10 / Gear^.Tag);
-AddGear(gx, gy, gtFlame, gstTmpFlag,
+flame:= AddGear(gx, gy, gtFlame, gstTmpFlag,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
+flame^.CollisionMask:= $FF7F;
 if (Gear^.Health mod 30) = 0 then
-AddGear(gx, gy, gtFlame, 0,
+begin
+flame:= AddGear(gx, gy, gtFlame, 0,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
+flame^.CollisionMask:= $FF7F;
+end
 end;
 Gear^.Timer:= Gear^.Tag
 end;
 if (Gear^.Health = 0) or (HHGear^.Damage <> 0) then
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepLandGunWork(Gear: PGear);
 var
-HHGear: PGear;
+HHGear, land: PGear;
 rx, ry, speed: hwFloat;
 i, gX, gY: LongInt;
 begin
 AllInactive := false;
 HHGear := Gear^.Hedgehog^.Gear;
 rx := rndSign(getRandomf * _0_1);
 ry := rndSign(getRandomf * _0_1);
 speed := (_3 / Gear^.Tag);
-AddGear(gx, gy, gtFlake, gstTmpFlag,
+land:= AddGear(gx, gy, gtFlake, gstTmpFlag,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
+land^.CollisionMask:= $FF7F;
 Gear^.Timer:= Gear^.Tag
 end;
 if (Gear^.Health = 0) or (HHGear^.Damage <> 0) or ((HHGear^.Message and gmAttack) <> 0) then
 //tmp^.State:= tmp^.State or gstFlatened;
 if not tmp^.Invulnerable then
 ApplyDamage(tmp, CurrentHedgehog, tmp^.Health div 3, dsUnknown);
 //DrawTunnel(tmp^.X, tmp^.Y - _1, _0, _0_5, cHHRadius * 6, cHHRadius * 3);
 tmp2:= AddGear(hwRound(tmp^.X), hwRound(tmp^.Y), gtHammerHit, 0, _0, _0, 0);
-tmp2^.IntersectGear:= tmp;
+tmp2^.LinkedGear:= tmp;
 SetAllToActive
 end
 else
 begin
 end
 var
 i, j, ei: LongInt;
 HitGear: PGear;
 begin
 AllInactive := false;
-HitGear := Gear^.IntersectGear;
+HitGear := Gear^.LinkedGear;
 dec(Gear^.Timer);
 if (HitGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then
 begin
 DeleteGear(Gear);
 exit

changeset 7288	5d0704f23a2a
parent 7283	322ff9418461
child 7293	468cf6d561e5