hedgewars-draft: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:1998ff75321a
+:d14adf1c7721
 if (GameFlags and gfMoreWind) <> 0 then Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density
 end;
 Gear^.X := Gear^.X + Gear^.dX;
 Gear^.Y := Gear^.Y + Gear^.dY;
-CheckGearDrowning(Gear);
+if Gear^.Kind <> gtBee then
+CheckGearDrowning(Gear);
 //if (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) < _0_0002) and
 if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_02.QWordValue) and
 (not isFalling) then
 Gear^.State := Gear^.State and not gstMoving
 else
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepBeeWork(Gear: PGear);
 var
 t: hwFloat;
 gX,gY,i: LongInt;
-nuw: boolean;
+uw, nuw: boolean;
 flower: PVisualGear;
-const uw: boolean =   false;
 begin
 AllInactive := false;
 gX := hwRound(Gear^.X);
 gY := hwRound(Gear^.Y);
-nuw := (cWaterLine < gy + Gear^.Radius);
+uw := (Gear^.Tag <> 0); // was bee underwater last tick?
-if nuw and not uw then
+nuw := (cWaterLine < gy + Gear^.Radius); // is bee underwater now?
+// if water entered or left
+if nuw <> uw then
 begin
 AddVisualGear(gX, cWaterLine, vgtSplash);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
 AddVisualGear(gX - 3 + Random(6), cWaterLine, vgtDroplet);
 StopSound(Gear^.SoundChannel);
-Gear^.SoundChannel := LoopSound(sndBeeWater);
+if nuw then
-uw := nuw
+begin
-end
+Gear^.SoundChannel := LoopSound(sndBeeWater);
-else if not nuw and uw then
+Gear^.Tag := 1;
-begin
+end
-AddVisualGear(gX, cWaterLine, vgtSplash);
+else
-StopSound(Gear^.SoundChannel);
+begin
 Gear^.SoundChannel := LoopSound(sndBee);
-uw := nuw
+Gear^.Tag := 0;
 end;
+end;
-if (GameTicks and $F) = 0 then
-begin
+if Gear^.Timer = 0 then
-if (GameTicks and $30) = 0 then
+Gear^.RenderTimer:= false
-AddVisualGear(gX, gY, vgtBeeTrace);
+else
-Gear^.dX := Gear^.Elasticity * (Gear^.dX + _0_000064 * (Gear^.Target.X - gX));
+begin
-Gear^.dY := Gear^.Elasticity * (Gear^.dY + _0_000064 * (Gear^.Target.Y - gY));
+if (GameTicks and $F) = 0 then
-// make sure new speed isn't higher than original one (which we stored in Friction variable)
+begin
-t := Gear^.Friction / Distance(Gear^.dX, Gear^.dY);
+if (GameTicks and $30) = 0 then
-Gear^.dX := Gear^.dX * t;
+AddVisualGear(gX, gY, vgtBeeTrace);
-Gear^.dY := Gear^.dY * t;
+Gear^.dX := Gear^.Elasticity * (Gear^.dX + _0_000064 * (Gear^.Target.X - gX));
-end;
+Gear^.dY := Gear^.Elasticity * (Gear^.dY + _0_000064 * (Gear^.Target.Y - gY));
+// make sure new speed isn't higher than original one (which we stored in Friction variable)
-Gear^.X := Gear^.X + Gear^.dX;
+t := Gear^.Friction / Distance(Gear^.dX, Gear^.dY);
-Gear^.Y := Gear^.Y + Gear^.dY;
+Gear^.dX := Gear^.dX * t;
+Gear^.dY := Gear^.dY * t;
+end;
+Gear^.X := Gear^.X + Gear^.dX;
+Gear^.Y := Gear^.Y + Gear^.dY;
+end;
 CheckCollision(Gear);
-dec(Gear^.Timer);
+if ((Gear^.State and gstCollision) <> 0) then
-if ((Gear^.State and gstCollision) <> 0) or (Gear^.Timer = 0) then
 begin
 StopSound(Gear^.SoundChannel);
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
 for i:= 0 to 31 do
 begin
 FrameTicks:= random(250) + 250;
 State:= ord(sprTargetBee);
 end;
 end;
 DeleteGear(Gear);
+end;
+if (Gear^.Timer > 0) then
+dec(Gear^.Timer)
+else
+begin
+if nuw then
+begin
+StopSound(Gear^.SoundChannel);
+CheckGearDrowning(Gear);
+end
+else
+doStepFallingGear(Gear);
 end;
 end;
 procedure doStepBee(Gear: PGear);
 begin
 begin
 DrawExplosion(i, y + 3, 3);
 inc(i, 1)
 end;
-if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9)
+if CheckLandValue(hwRound(Gear^.X + Gear^.dX + SignAs(_6,Gear^.dX)), hwRound(Gear^.Y + _1_9), lfIndestructible) then
-, lfIndestructible) then
 begin
 Gear^.X := Gear^.X + Gear^.dX;
 Gear^.Y := Gear^.Y + _1_9;
 end;
 SetAllHHToActive;
 SetLittle(HHGear^.dX);
 HHGear^.dY := _0;
 end
 else
 begin
-Gear^.dY := Gear^.dY + cGravity;
+if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y + Gear^.dY + cGravity), lfIndestructible) then
-Gear^.Y := Gear^.Y + Gear^.dY;
+begin
+Gear^.dY := Gear^.dY + cGravity;
+Gear^.Y := Gear^.Y + Gear^.dY
+end;
 if hwRound(Gear^.Y) > cWaterLine then Gear^.Timer := 1
 end;
 Gear^.X := Gear^.X + HHGear^.dX;
-HHGear^.X := Gear^.X;
+if CheckLandValue(hwRound(Gear^.X), hwRound(Gear^.Y)-cHHRadius, lfIndestructible) then
-HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius);
+begin
+HHGear^.X := Gear^.X;
+HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius)
+end;
 if (Gear^.Message and gmAttack) <> 0 then
 if (Gear^.State and gsttmpFlag) <> 0 then Gear^.Timer := 1
 else
 else
 HHGear^.State := HHGear^.State and not gstNoDamage
 end;
 end;
 if b then
-DrawTunnel(HHGear^.X - Gear^.dX * cHHRadius, HHGear^.Y - _4 - Gear^.dY * cHHRadius + hwAbs(
+begin
-Gear^.dY) * 7,
+DrawTunnel(HHGear^.X + Gear^.dX * cHHRadius,
+HHGear^.Y + Gear^.dY * cHHRadius - _1 -
+((hwAbs(Gear^.dX) / (hwAbs(Gear^.dX) + hwAbs(Gear^.dY))) * _0_5 * 7),
 Gear^.dX, Gear^.dY,
-cHHRadius * 5, cHHRadius * 2 + 7);
+cHHStepTicks, cHHRadius * 2 + 7);
+end;
 if (TurnTimeLeft = 0) or (Gear^.Timer = 0) or ((HHGear^.Message and gmAttack) <> 0) then
 begin
 HHGear^.Message := 0;
 HHGear^.State := HHGear^.State and (not gstNotKickable);
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
-if not bShowAmmoMenu and not CurrentTeam^.ExtDriven then FollowGear := HHGear;
+// This is probably not needed anymore
+if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
 if not isUnderWater and hasBorder and ((HHGear^.X < _0) or (hwRound(HHGear^.X) > LAND_WIDTH)) then HHGear^.dY.isNegative:= false;
 if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
 if // (Gear^.Health = 0)
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y - int2hwFloat(32);
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
-if not bShowAmmoMenu then FollowGear := HHGear;
+// this is probably not needed anymore
+if not CurrentTeam^.ExtDriven then FollowGear := HHGear;
 if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
 if  (Gear^.Health = 0)
 or (HHGear^.Damage <> 0)
 var
 r0, r1: LongInt;
 odY: hwFloat;
 begin
 AllInactive := false;
-if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and ((CurrentHedgehog^.Gear^.
+if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and
-Message and gmSlot) <> 0) then
+((CurrentHedgehog^.Gear^.Message and gmSlot) <> 0) then
 begin
 case CurrentHedgehog^.Gear^.MsgParam of
 0: PlaySound(sndPiano0);
 1: PlaySound(sndPiano1);
 2: PlaySound(sndPiano2);
 3: PlaySound(sndPiano3);
 else PlaySound(sndPiano8);
 end;
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote);
 CurrentHedgehog^.Gear^.MsgParam := 0;
 CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and not gmSlot;
 end;
 if (*((Gear^.Pos = 3) and ((GameFlags and gfSolidLand) <> 0)) or*) (Gear^.Pos = 5) then
-// bounce up to 10 times (3 times on gameflagged solid land) before dropping past landscape
+begin
-begin
 Gear^.dY := Gear^.dY + cGravity * 2;
 Gear^.Y := Gear^.Y + Gear^.dY;
 CheckGearDrowning(Gear);
 if (Gear^.State and gstDrowning) <> 0 then
 begin
+OnUsedAmmo(CurrentHedgehog^);
 if CurrentHedgehog^.Gear <> nil then
 begin
 // Drown the hedgehog.  Could also just delete it, but hey, this gets a caption
 CurrentHedgehog^.Gear^.Active := true;
 CurrentHedgehog^.Gear^.X := Gear^.X;
 CurrentHedgehog^.Gear^.Y := int2hwFloat(cWaterLine+cVisibleWater)+_128;
 CurrentHedgehog^.Unplaced := false;
 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:= 0
 end;
 ResumeMusic
 end;
 exit
 end;
 odY:= Gear^.dY;
 doStepFallingGear(Gear);
 if (Gear^.State and gstDrowning) <> 0 then
 begin
+OnUsedAmmo(CurrentHedgehog^);
 if CurrentHedgehog^.Gear <> nil then
 begin
 // Drown the hedgehog.  Could also just delete it, but hey, this gets a caption
 CurrentHedgehog^.Gear^.Active := true;
 CurrentHedgehog^.Gear^.X := Gear^.X;
 CurrentHedgehog^.Gear^.Y := int2hwFloat(cWaterLine+cVisibleWater)+_128;
 CurrentHedgehog^.Unplaced := false;
 if TagTurnTimeLeft = 0 then TagTurnTimeLeft:= TurnTimeLeft;
 TurnTimeLeft:= 0
 end;
 ResumeMusic
 end
 else if (Gear^.State and gstCollision) <> 0 then
 begin
 r0 := GetRandom(21);
 r1 := GetRandom(21);
 doMakeExplosion(hwRound(Gear^.X) - 30 - r0, hwRound(Gear^.Y) + 40, 40 + r1, Gear^.Hedgehog, 0);
 doMakeExplosion(hwRound(Gear^.X) + 30 + r1, hwRound(Gear^.Y) + 40, 40 + r0, Gear^.Hedgehog, 0);
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 80 + r0, Gear^.Hedgehog, EXPLAutoSound);
 for r0:= 0 to 4 do
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtNote);
 Gear^.dY := odY * -1 + cGravity * 2;
 Gear^.Pos := Gear^.Pos + 1;
 end
 else
 Gear^.dY := Gear^.dY + cGravity * 2;
 // let it fall faster so itdoesn't take too long for the whole attack
 end;

branch	hedgeroid
changeset 6328	d14adf1c7721
parent 6325	cdd3d8c723ec
child 6368	cd819d9df6f6