sheepy-clone: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:026fd01a5e2c
+:4e8816cf9459
 CheckGearDrowning := true;
 Gear^.State := gstDrowning;
 Gear^.RenderTimer := false;
 if (Gear^.Kind <> gtSniperRifleShot) and (Gear^.Kind <> gtShotgunShot) and
 (Gear^.Kind <> gtDEagleShot) and (Gear^.Kind <> gtSineGunShot) then
 if Gear^.Kind = gtHedgehog then
 begin
 if Gear^.Hedgehog^.Effects[heResurrectable] then
 ResurrectHedgehog(Gear)
 else
 begin
 CheckGearDrowning := false;
 end;
 procedure CheckCollision(Gear: PGear); inline;
 begin
-if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or (TestCollisionYwithGear(Gear, hwSign(Gear^.dY)) <> 0)
+if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or (TestCollisionYwithGear(Gear, hwSign(Gear^.dY)) <> 0) then
-then Gear^.State := Gear^.State or      gstCollision
+Gear^.State := Gear^.State or gstCollision
 else Gear^.State := Gear^.State and not gstCollision
 end;
 procedure CheckCollisionWithLand(Gear: PGear); inline;
 begin
 collH := hwSign(Gear^.dX);
 Gear^.dX := - Gear^.dX * Gear^.Elasticity;
 Gear^.dY :=   Gear^.dY * Gear^.Elasticity;
 Gear^.State := Gear^.State or gstCollision
 end
 else if (Gear^.AdvBounce=1) and TestCollisionXwithGear(Gear, -hwSign(Gear^.dX)) then
 collH := -hwSign(Gear^.dX);
 //if Gear^.AdvBounce and (collV <>0) and (collH <> 0) and (hwSqr(tdX) + hwSqr(tdY) > _0_08) then
 if (Gear^.AdvBounce=1) and (collV <>0) and (collH <> 0) and ((collV=-1) or ((tdX.QWordValue +
 tdY.QWordValue) > _0_2.QWordValue)) then
 begin
 Gear^.AdvBounce := 10;
 end;
 if Gear^.AdvBounce > 1 then dec(Gear^.AdvBounce);
 if isFalling then
 begin
 Gear^.dY := Gear^.dY + cGravity;
 if (GameFlags and gfMoreWind) <> 0 then Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density
 end;
 for i:= 0 to 127 do
 begin
 dX := AngleCos(i * 16) * _0_5 * (GetRandom + _1);
 dY := AngleSin(i * 16) * _0_5 * (GetRandom + _1);
 if i mod 2 = 0 then
 begin
 AddGear(x, y, gtFlame, gstTmpFlag, dX, dY, 0);
 AddGear(x, y, gtFlame, 0, dX, -dY, 0)
 end
 else
 glass^.Tint:= $41B83ED0 - i * $10081000;
 glass^.dX:= 1/(10*(random(11)-5));
 glass^.dY:= -1/(random(4)+5);
 end;*)
 glass:= AddVisualGear(gx+random(7)-3, gy+random(7)-3, vgtStraightShot);
 if glass <> nil then
 with glass^ do
 begin
 Frame:= 2;
 Tint:= $41B83ED0 - i * $10081000;
 Angle:= random * 360;
 then move:=true
 else draw:= true
 end
 end
 end;
 if draw then
 with Gear^ do
 begin
 // we've collided with land. draw some stuff and get back into the clouds
 move:= true;
 if (Pos > 20) and ((CurAmmoGear = nil) or (CurAmmoGear^.Kind <> gtRope)) then
 StopSound(Gear^.SoundChannel);
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
 for i:= 0 to 31 do
 begin
 flower:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
 if flower <> nil then
 with flower^ do
 begin
 Scale:= 0.75;
 dx:= 0.001 * (random(200));
 dy:= 0.001 * (random(200));
 end;
 if (Gear^.Timer mod 47) = 0 then
 begin
 // ok. this was an attempt to turn off dust if not actually drilling land.  I have no idea why it isn't working as expected
 if (( (y + 12) and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y + 12, x] > 255) then
 for i:= 0 to 1 do
 AddVisualGear(x - 5 + Random(10), y + 12, vgtDust);
 i := x - Gear^.Radius - LongInt(GetRandom(2));
 ei := x + Gear^.Radius + LongInt(GetRandom(2));
 end;
 dec(Gear^.Timer);
 end
 end
 else // gsttmpFlag = 0
-if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime))  then Gear^.State := Gear^.State or gsttmpFlag;
+if (TurnTimeLeft = 0) or ((GameFlags and gfInfAttack <> 0) and (GameTicks > Gear^.FlightTime)) then
+Gear^.State := Gear^.State or gsttmpFlag;
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepDynamite(Gear: PGear);
 begin
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
 if (GameTicks mod 2 = 0) and hasWishes then
 begin
 sparkles:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtDust, 1);
 if sparkles <> nil then
 begin
 sparkles^.Tint:= ((random(210)+45) shl 24) or ((random(210)+45) shl 16) or ((random(210)+45) shl 8) or $FF;
 sparkles^.Angle:= random * 360;
 end
 end;
 inc(Gear^.Pos);
 if Gear^.Pos = 5 then
 PlaySound(sndYoohoo, Gear^.Hedgehog^.Team^.voicepack)
 end;
 if (Gear^.Pos = 14) and (RealTicks and $3 = 0) then
 begin
 heart:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
 if heart <> nil then
 with heart^ do
 begin
 dx:= 0.001 * (random(200));
 dy:= 0.001 * (random(200));
 if random(2) = 0 then dx := -dx;
 if isUnderwater then
 begin
 for i:= random(5)+5 downto 0 do
 begin
 bubble := AddVisualGear(hwRound(HHGear^.X)+random(8), hwRound(HHGear^.Y) - 8 + random(16), vgtBubble);
 if bubble <> nil then
 begin
 bubble^.dX:= (random(10)/10 + 0.02) * -1;
 if (move.isNegative) then
 begin
 bubble^.X := bubble^.X + 28;
 PlaySound(sndBirdyLay);
 dec(Gear^.FlightTime)
 end;
 end;
 if HHGear^.Message and (gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
 Gear^.State := Gear^.State and not gsttmpFlag;
 HHGear^.Message := HHGear^.Message and not (gmUp or gmPrecise or gmLeft or gmRight);
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 AddGear(gx, gy, gtFlame, gstTmpFlag,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
 if (Gear^.Health mod 30) = 0 then
 AddGear(gx, gy, gtFlame, 0,
 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
 end;
 Gear^.Timer:= Gear^.Tag
 cHHRadius - 14 - hh^.HealthTagTex^.h, hh^.HealthTagTex);
 }
 (*DrawCircle(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Radius, 1.5, 0, 0, $FF,
 $FF);*)
 if ((Gear^.Message and gmUp) <> 0) then
 begin
 if (GameTicks and $F) <> 0 then exit;
 end
 else if (GameTicks and $1FF) <> 0 then exit;
 if Gear^.Power < 45 then
 begin
 inc(Gear^.Power);
 if TestCollisionYwithGear(hh^.Gear, -1) = 0 then hh^.Gear^.Y := hh^.Gear^.Y - _1;
 end;
 graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius);
 if Length(graves) = 0 then
 begin
 StopSound(Gear^.SoundChannel);
 Gear^.Timer := 250;
 Gear^.doStep := @doStepIdle;
 exit;
 end;
 if ((Gear^.Message and gmAttack) <> 0) and (hh^.Gear^.Health > 0) and (TurnTimeLeft > 0) then
 begin
 if Length(graves) <= 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;
 Gear^.State:= Gear^.State and not gstMoving;
 end;
 if CurAmmoGear = Gear then
 begin
 if (CurrentHedgehog = nil) or (CurrentHedgehog^.Gear = nil) then
 begin
 DeleteGear(Gear);
 exit
 end;
 if Gear = CurAmmoGear then CurAmmoGear := nil;
 Gear^.SoundChannel := LoopSound(sndTardis);
 Gear^.Pos:= 3
 end
 end;
 if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then
 begin
 inc(Gear^.Power);
 if (Gear^.Power = 172) and (HH^.Gear <> nil) and
 (HH^.Gear^.Damage = 0) and (HH^.Gear^.Health > 0) and
 ((HH^.Gear^.State and (gstMoving or gstHHDeath or gstHHGone)) = 0) then
 Gear^.SoundChannel := LoopSound(sndTardis);
 Gear^.Pos:= 1;
 Gear^.Power:= 0;
 Gear^.Timer:= 0;
 if HH^.GearHidden <> nil then FindPlace(HH^.GearHidden, false, 0, LAND_WIDTH,true);
 if HH^.GearHidden <> nil then
 begin
 Gear^.X:= HH^.GearHidden^.X;
 Gear^.Y:= HH^.GearHidden^.Y;
 //HH^.Gear:=HH^.GearHidden;
 //HH^.GearHidden:= nil;
 1. Hog is last of his clan
 2. Sudden Death is in play
 3. Hog is a king
 *)
 HH:= Gear^.Hedgehog;
 if HH^.Gear <> nil then
 if (HH^.Gear = nil) or (HH^.King) or (SuddenDeathDmg) then
 begin
 if HH^.Gear <> nil then
 begin
 HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
 HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
 end;
 PlaySound(sndDenied);
 ((HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.State and gstDrowning) = 0) and
 (HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Health >
 HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Damage) then inc(cnt);
 if cnt < 2 then
 begin
 if HH^.Gear <> nil then
 begin
 HH^.Gear^.Message := HH^.Gear^.Message and not gmAttack;
 HH^.Gear^.State:= HH^.Gear^.State and not gstAttacking;
 end;
 PlaySound(sndDenied);

changeset 6131	4e8816cf9459
parent 6130	026fd01a5e2c
parent 5995	647d52370ce9
child 6154	72c6239a7cc6