sheepy-clone: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:bc3306c59a08
+:9bb6abdb5675
 if FollowGear = HH^.Gear then
 FollowGear:= nil;
 if lastGearByUID = HH^.Gear then
 lastGearByUID := nil;
-RemoveGearFromList(HH^.Gear);
+HH^.Gear^.Message:= HH^.Gear^.Message or gmRemoveFromList;
 with HH^.Gear^ do
 begin
 Z := cHHZ;
-Active := false;
+HH^.Gear^.Active:= false;
 State:= State and (not (gstHHDriven or gstAttacking or gstAttacked));
 Message := Message and (not gmAttack);
 end;
 HH^.GearHidden:= HH^.Gear;
 HH^.Gear:= nil
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepGrave(Gear: PGear);
 begin
+if (Gear^.Message and gmDestroy) <> 0 then
+begin
+DeleteGear(Gear);
+exit
+end;
 AllInactive := false;
 if Gear^.dY.isNegative then
 if TestCollisionY(Gear, -1) then
 Gear^.dY := _0;
 if not Gear^.dY.isNegative then
 k: TGearType;
 exBoom: boolean;
 dX, dY: HWFloat;
 hog: PHedgehog;
 sparkles: PVisualGear;
+gi: PGear;
 begin
 k := Gear^.Kind;
 exBoom := false;
 if (Gear^.Message and gmDestroy) > 0 then
 if Gear^.Health <= 0 then
 exBoom := true;
 end
 else
 begin
+if (Gear^.Pos <> posCaseHealth) and (GameTicks and $3FF = 0) then // stir it up every second or so
+begin
+gi := GearsList;
+while gi <> nil do
+begin
+if gi^.Kind = gtGenericFaller then
+begin
+gi^.Active:= true;
+gi^.X:=  int2hwFloat(GetRandom(rightX-leftX)+leftX);
+gi^.Y:=  int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY);
+gi^.dX:= _90-(GetRandomf*_360);
+gi^.dY:= _90-(GetRandomf*_360)
+end;
+gi := gi^.NextGear
+end
+end;
 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. *)
 else if ((GameTicks and $3) = 3) then
 doMakeExplosion(gX, gY, 8, Gear^.Hedgehog, 0);//, EXPLNoDamage);
 //DrawExplosion(gX, gY, 4);
 if ((GameTicks and $7) = 0) and (Random(2) = 0) then
-for i:= 1 to Random(2)+1 do
+for i:= Random(2) downto 0 do
 AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
 if Gear^.Health > 0 then
 dec(Gear^.Health);
 Gear^.Timer := 450 - Gear^.Tag * 8
 // Modified fire
 if ((GameTicks and $7FF) = 0) and ((GameFlags and gfSolidLand) = 0) then
 begin
 DrawExplosion(gX, gY, 4);
-for i:= 0 to Random(3) do
+for i:= Random(3) downto 0 do
 AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
 end;
 // This one is interesting.  I think I understand the purpose, but I wonder if a bit more fuzzy of kicking could be done with getrandom.
 Gear^.Timer := 100 - Gear^.Tag * 3;
 gX := hwRound(Gear^.X);
 gY := hwRound(Gear^.Y);
 if not sticky then
 begin
 if ((GameTicks and $3) = 0) and (Random(1) = 0) then
-begin
+for i:= Random(2) downto 0 do
-for i:= 1 to Random(2)+1 do
-begin
 AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
-end;
-end;
 end
 else
-begin
+for i:= Random(3) downto 0 do
-for i:= 0 to Random(3) do
-begin
 AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
-end;
-end;
 DeleteGear(Gear)
 end;
 end;
 HHGear := CurrentHedgehog^.Gear;
 HHGear^.Message := HHGear^.Message and (not gmSwitch);
 Gear^.Message := Gear^.Message and (not gmSwitch);
 State := HHGear^.State;
 HHGear^.State := 0;
+HHGear^.Z := cHHZ;
 HHGear^.Active := false;
-HHGear^.Z := cHHZ;
+HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList;
-RemoveGearFromList(HHGear);
-InsertGearToList(HHGear);
 PlaySound(sndSwitchHog);
 repeat
 CurrentTeam^.CurrHedgehog := Succ(CurrentTeam^.CurrHedgehog) mod (CurrentTeam^.HedgehogsNumber);
 HHGear := CurrentHedgehog^.Gear;
 HHGear^.State := State;
 HHGear^.Active := true;
 FollowGear := HHGear;
 HHGear^.Z := cCurrHHZ;
-RemoveGearFromList(HHGear);
+HHGear^.Message:= HHGear^.Message or gmRemoveFromList or gmAddToList;
-InsertGearToList(HHGear);
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y
 end;
 end;
 dy := -dy;
 FrameTicks:= random(400) + 250
 end
 end;
 AfterAttack;
-DeleteGear(HHGear);
+HHGear^.Message:= HHGear^.Message or gmDestroy;
 DeleteGear(Gear);
 end
 else
 begin
 dec(Gear^.Health, Gear^.Damage);
 end;
 ////////////////////////////////////////////////////////////////////////////////
 const cakeh =   27;
-cakeDmg =   75;
 var
 CakePoints: array[0..Pred(cakeh)] of record
 x, y: hwFloat;
 end;
 CakeI: Longword;
 inc(Gear^.Tag);
 if Gear^.Tag < 7 then
 exit;
+dec(Gear^.Health);
+Gear^.Timer := Gear^.Health*10;
+if Gear^.Health mod 100 = 0 then
+Gear^.PortalCounter:= 0;
+// This is not seconds, but at least it is *some* feedback
+if (Gear^.Health = 0) or ((Gear^.Message and gmAttack) <> 0) then
+begin
+FollowGear := Gear;
+Gear^.RenderTimer := false;
+Gear^.doStep := @doStepCakeDown;
+exit
+end;
 cakeStep(Gear);
 if Gear^.Tag = 0 then
 begin
 CakeI := (CakeI + 1) mod cakeh;
 tdy := - CakePoints[CakeI].y + Gear^.Y;
 CakePoints[CakeI].x := Gear^.X;
 CakePoints[CakeI].y := Gear^.Y;
 Gear^.DirAngle := DxDy2Angle(tdx, tdy);
 end;
-dec(Gear^.Health);
-Gear^.Timer := Gear^.Health*10;
-if Gear^.Health mod 100 = 0 then
-Gear^.PortalCounter:= 0;
-// This is not seconds, but at least it is *some* feedback
-if (Gear^.Health = 0) or ((Gear^.Message and gmAttack) <> 0) then
-begin
-FollowGear := Gear;
-Gear^.RenderTimer := false;
-Gear^.doStep := @doStepCakeDown
-end
 end;
 procedure doStepCakeUp(Gear: PGear);
 var
 i: Longword;
 and (iterator = CurrentHedgehog^.Gear)
 and (CurAmmoGear <> nil)
 and (CurAmmoGear^.Kind =gtRope) then
 CurAmmoGear^.PortalCounter:= 1;
-if not isbullet
+if not isbullet and (iterator^.State and gstInvisible = 0)
 and (iterator^.Kind <> gtFlake) then
 FollowGear := iterator;
 // store X/Y values of exit for net bullet trail
 if isbullet then
 begin
 Gear^.State := Gear^.State or gstCollision;
 Gear^.State := Gear^.State and (not gstMoving);
 if (Land[y, x] and lfBouncy <> 0)
-or not CalcSlopeTangent(Gear, x, y, tx, ty, 255)
+or (not CalcSlopeTangent(Gear, x, y, tx, ty, 255))
 or (DistanceI(tx,ty) < _12) then // reject shots at too irregular terrain
 begin
 loadNewPortalBall(Gear, true);
 EXIT;
 end;
 dec(Gear^.Health, Gear^.Damage);
 Gear^.Damage := 0;
 // add some fire to the tunnel
 if getRandom(6) = 0 then
-AddGear(x - Gear^.Radius + LongInt(getRandom(2 * Gear^.Radius)), y -
+begin
-getRandom(Gear^.Radius + 1), gtFlame, gsttmpFlag, _0, _0, 0);
+tmp:= GetRandom(2 * Gear^.Radius);
+AddGear(x - Gear^.Radius + tmp, y - GetRandom(Gear^.Radius + 1), gtFlame, gsttmpFlag, _0, _0, 0)
+end
 end;
-if getRandom(100) = 0 then
+if random(100) = 0 then
 AddVisualGear(x, y, vgtSmokeTrace);
 end
 else dec(Gear^.Health, 5); // if underwater get additional damage
 end;
 if graves.size <= Gear^.Tag then Gear^.Tag:= 0;
 dec(hh^.Gear^.Health);
 if (hh^.Gear^.Health = 0) and (hh^.Gear^.Damage = 0) then
 hh^.Gear^.Damage:= 1;
 RenderHealth(hh^);
+RecountTeamHealth(hh^.Team);
 inc(graves.ar^[Gear^.Tag]^.Health);
 inc(Gear^.Tag)
 {-for i:= 0 to High(graves) do begin
 if hh^.Gear^.Health > 0 then begin
 dec(hh^.Gear^.Health);
 begin
 resgear := AddGear(hwRound(graves.ar^[i]^.X), hwRound(graves.ar^[i]^.Y), gtHedgehog, gstWait, _0, _0, 0);
 resgear^.Hedgehog := graves.ar^[i]^.Hedgehog;
 resgear^.Health := graves.ar^[i]^.Health;
 PHedgehog(graves.ar^[i]^.Hedgehog)^.Gear := resgear;
-DeleteGear(graves.ar^[i]);
+graves.ar^[i]^.Message:= graves.ar^[i]^.Message or gmDestroy;
+graves.ar^[i]^.Active:= true;
 RenderHealth(resgear^.Hedgehog^);
 RecountTeamHealth(resgear^.Hedgehog^.Team);
 resgear^.Hedgehog^.Effects[heResurrected]:= 1;
 // only make hat-less hedgehogs look like zombies, preserve existing hats
 if resgear^.Hedgehog^.Hat = 'NoHat' then
 LoadHedgehogHat(resgear, 'Reserved/Zombie');
 end;
 hh^.Gear^.dY := _0;
 Y:= HHGear^.Y
 end
 end
 end;
 end;
+procedure doStepAddAmmo(Gear: PGear);
+var a: TAmmoType;
+gi: PGear;
+begin
+if Gear^.Timer > 0 then dec(Gear^.Timer)
+else
+begin
+if Gear^.Pos = posCaseUtility then
+a:= GetUtility(Gear^.Hedgehog)
+else
+a:= GetAmmo(Gear^.Hedgehog);
+CheckSum:= CheckSum xor GameTicks;
+gi := GearsList;
+while gi <> nil do
+begin
+with gi^ do CheckSum:= CheckSum xor X.round xor X.frac xor dX.round xor dX.frac xor Y.round xor Y.frac xor dY.round xor dY.frac;
+AddRandomness(CheckSum);
+gi := gi^.NextGear
+end;
+AddPickup(Gear^.Hedgehog^, a, Gear^.Power, hwRound(Gear^.X), hwRound(Gear^.Y));
+DeleteGear(Gear)
+end;
+end;
+procedure doStepGenericFaller(Gear: PGear);
+begin
+if Gear^.Timer < $FFFFFFFF then
+if Gear^.Timer > 0 then
+dec(Gear^.Timer)
+else
+begin
+DeleteGear(Gear);
+exit
+end;
+doStepFallingGear(Gear);
+end;

changeset 7442	9bb6abdb5675
parent 7426	55b49cc1f33a
child 7468	1333ca7554dc