hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:e944cc43f7a4
+:4f2b1a152979
 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 PHedgehog(Gear^.Hedgehog)^.Effects[heResurrectable] then
+if Gear^.Hedgehog^.Effects[heResurrectable] then
 ResurrectHedgehog(Gear)
 else
 begin
 Gear^.doStep := @doStepDrowningGear;
 Gear^.State := Gear^.State and (not gstHHDriven);
-AddCaption(Format(GetEventString(eidDrowned), PHedgehog(Gear^.Hedgehog)^.Name), cWhiteColor, capgrpMessage);
+AddCaption(Format(GetEventString(eidDrowned), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
 end
 end
 else
 Gear^.doStep := @doStepDrowningGear
 end;
 end;
 if (Gear^.Invulnerable) then exit;
 //if _0_6 < Gear^.dY then
-//    PlaySound(sndOw4, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
+//    PlaySound(sndOw4, Gear^.Hedgehog^.Team^.voicepack)
 //else
-//    PlaySound(sndOw1, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+//    PlaySound(sndOw1, Gear^.Hedgehog^.Team^.voicepack);
 ApplyDamage(Gear, dmg, dsFall);
 end
 end;
 exit
 end;
 dec(Gear^.Timer);
 if Gear^.Timer = 0 then
 begin
-PHedgehog(Gear^.Hedgehog)^.Gear^.Message:= PHedgehog(Gear^.Hedgehog)^.Gear^.Message and not gmAttack;
+Gear^.Hedgehog^.Gear^.Message:= Gear^.Hedgehog^.Gear^.Message and not gmAttack;
-PHedgehog(Gear^.Hedgehog)^.Gear^.State:= PHedgehog(Gear^.Hedgehog)^.Gear^.State and not gstAttacking;
+Gear^.Hedgehog^.Gear^.State:= Gear^.Hedgehog^.Gear^.State and not gstAttacking;
 AttackBar:= 0;
 Gear^.SoundChannel := LoopSound(sndBee);
 Gear^.Timer := 5000;
 // save initial speed in otherwise unused Friction variable
 var
 HHGear: PGear;
 shell: PVisualGear;
 begin
 cArtillery := true;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.State := HHGear^.State or gstNotKickable;
 HedgehogChAngle(HHGear);
 if not cLaserSighting then
 // game does not have default laser sight. turn it on and give them a chance to aim
 begin
 var
 i, ei: LongInt;
 HHGear: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 dec(Gear^.Timer);
 if (Gear^.Timer = 0)or((Gear^.Message and gmDestroy) <> 0)or((HHGear^.State and gstHHDriven) =
 0) then
 begin
 StopSound(Gear^.SoundChannel);
 i, y: LongInt;
 ar: TRangeArray;
 HHGear: PGear;
 begin
 i := 0;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 y := hwRound(Gear^.Y) - cHHRadius * 2;
 while y < hwRound(Gear^.Y) do
 begin
 ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2));
 b: boolean;
 prevX: LongInt;
 begin
 AllInactive := false;
 dec(Gear^.Timer);
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HedgehogChAngle(HHGear);
 b := false;
 var
 HHGear: PGear;
 begin
 BTPrevAngle := High(LongInt);
 BTSteps := 0;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Message := 0;
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepBlowTorchWork
 end;
 procedure doStepRopeAfterAttack(Gear: PGear);
 var
 HHGear: PGear;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 if ((HHGear^.State and gstHHDriven) = 0)
 or (CheckGearDrowning(HHGear))
 or TestCollisionYwithGear(HHGear, 1) then
 begin
 DeleteGear(Gear);
 if (Gear^.Message and gmAttack) <> 0 then
 begin
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
-ApplyAngleBounds(PHedgehog(Gear^.Hedgehog)^, amRope);
+ApplyAngleBounds(Gear^.Hedgehog^, amRope);
 Gear^.dX := SignAs(AngleSin(HHGear^.Angle), HHGear^.dX);
 Gear^.dY := -AngleCos(HHGear^.Angle);
 Gear^.Friction := _450;
 Gear^.Elasticity := _0;
 Gear^.Elasticity := _0;
 Gear^.doStep := @doStepRopeAfterAttack
 end;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 if ((HHGear^.State and gstHHDriven) = 0)
 or (CheckGearDrowning(HHGear)) then
 begin
 PlaySound(sndRopeRelease);
 end;
 if (Gear^.Message and gmAttack) <> 0 then
 if (Gear^.State and gsttmpFlag) <> 0 then
-with PHedgehog(Gear^.Hedgehog)^ do
+with Gear^.Hedgehog^ do
 begin
 PlaySound(sndRopeRelease);
 if CurAmmoType <> amParachute then
 WaitCollision
 else
 begin
 Gear^.X := Gear^.X - Gear^.dX;
 Gear^.Y := Gear^.Y - Gear^.dY;
 Gear^.Elasticity := Gear^.Elasticity + _1;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 DeleteCI(HHGear);
 if (HHGear^.State and gstMoving) <> 0 then
 begin
 if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
 if (Gear^.Elasticity > Gear^.Friction)
 or ((Gear^.Message and gmAttack) = 0)
 or ((HHGear^.State and gstHHDriven) = 0)
 or (HHGear^.Damage > 0) then
 begin
-with PHedgehog(Gear^.Hedgehog)^.Gear^ do
+with Gear^.Hedgehog^.Gear^ do
 begin
 State := State and not gstAttacking;
 Message := Message and not gmAttack
 end;
 DeleteGear(Gear)
 procedure doStepShover(Gear: PGear);
 var
 HHGear: PGear;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.State := HHGear^.State or gstNoDamage;
 DeleteCI(HHGear);
 AmmoShove(Gear, 30, 115);
 procedure doStepWhip(Gear: PGear);
 var
 HHGear: PGear;
 i: LongInt;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.State := HHGear^.State or gstNoDamage;
 DeleteCI(HHGear);
 for i:= 0 to 3 do
 begin
 DeleteGear(Gear);
 AfterAttack;
 exit
 end;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 if hwRound(HHGear^.Y) <= Gear^.Tag - 2 then
 begin
 Gear^.Tag := hwRound(HHGear^.Y);
 DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y - _1, _0_5, _0, cHHRadius * 4, 2);
 HHGear^.State := HHGear^.State or gstNoDamage;
 procedure doStepFirePunch(Gear: PGear);
 var
 HHGear: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 DeleteCI(HHGear);
 HHGear^.X := int2hwFloat(hwRound(HHGear^.X)) - _0_5;
 HHGear^.dX := SignAs(cLittle, Gear^.dX);
 HHGear^.dY := - _0_3;
 procedure doStepParachuteWork(Gear: PGear);
 var
 HHGear: PGear;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 inc(Gear^.Timer);
 if TestCollisionYwithGear(HHGear, 1)
 or ((HHGear^.State and gstHHDriven) = 0)
 procedure doStepParachute(Gear: PGear);
 var
 HHGear: PGear;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 DeleteCI(HHGear);
 AfterAttack;
 HHGear: PGear;
 x, y, tx, ty: hwFloat;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 tx := int2hwFloat(TargetPoint.X);
 ty := int2hwFloat(TargetPoint.Y);
 x := HHGear^.X;
 y := HHGear^.Y;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepTeleportAfter(Gear: PGear);
 var
 HHGear: PGear;
 begin
-PHedgehog(Gear^.Hedgehog)^.Unplaced := false;
+Gear^.Hedgehog^.Unplaced := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Y := HHGear^.Y + HHGear^.dY;
 // hedgehog falling to collect cases
 HHGear^.dY := HHGear^.dY + cGravity;
 if TestCollisionYwithGear(HHGear, 1)
 or CheckGearDrowning(HHGear) then
 var
 HHGear: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 if not TryPlaceOnLand(TargetPoint.X - SpritesData[sprHHTelepMask].Width div 2,
 TargetPoint.Y - SpritesData[sprHHTelepMask].Height div 2,
 sprHHTelepMask, 0, false) then
 begin
 HHGear^.Message := HHGear^.Message and not gmAttack;
 begin
 AllInactive := false;
 if ((Gear^.Message and not gmSwitch) <> 0) or (TurnTimeLeft = 0) then
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 Msg := Gear^.Message and not gmSwitch;
 DeleteGear(Gear);
 OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
 ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^);
 var
 HHGear: PGear;
 begin
 Gear^.doStep := @doStepSwitcherWork;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 with HHGear^ do
 begin
 State := State and not gstAttacking;
 Message := Message and not gmAttack
 end
 i: LongWord;
 HHGear: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.State := HHGear^.State or gstNoDamage;
 DeleteCI(HHGear);
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
 AllInactive := false;
 dec(Gear^.Timer);
 if Gear^.Timer = 0 then
 begin
 Gear^.Pos := 1;
-PlaySound(sndKamikaze, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+PlaySound(sndKamikaze, Gear^.Hedgehog^.Team^.voicepack);
 Gear^.doStep := @doStepKamikazeWork
 end
 end;
 procedure doStepKamikaze(Gear: PGear);
 var
 HHGear: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.dX := Gear^.dX;
 HHGear^.dY := Gear^.dY;
 Gear^.dX := SignAs(_0_45, Gear^.dX);
 var
 HHGear: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Message := HHGear^.Message and (not gmAttack);
 DeleteCI(HHGear);
 Gear^.IntersectGear:= nil;
 FollowGear := Gear;
 if Gear^.Timer > 250 then
 begin
 Gear^.Timer := 0;
 inc(Gear^.Pos);
 if Gear^.Pos = 5 then
-PlaySound(sndYoohoo, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack)
+PlaySound(sndYoohoo, Gear^.Hedgehog^.Team^.voicepack)
 end;
 if Gear^.Pos = 14 then
 Gear^.doStep := @doStepSeductionWork
 end;
 procedure doStepSeduction(Gear: PGear);
 begin
 AllInactive := false;
-DeleteCI(PHedgehog(Gear^.Hedgehog)^.Gear);
+DeleteCI(Gear^.Hedgehog^.Gear);
 Gear^.doStep := @doStepSeductionWear
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepWaterUp(Gear: PGear);
 rx, ry: hwFloat;
 gX, gY: LongInt;
 begin
 AllInactive := false;
 dec(Gear^.Timer);
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HedgehogChAngle(HHGear);
 gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
 gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle);
 if (Gear^.Timer mod 100) = 0 then
 begin
 procedure doStepBallgun(Gear: PGear);
 var
 HHGear: PGear;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Message := HHGear^.Message and not (gmUp or gmDown);
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepBallgunWork
 end;
 if ((TrainingFlags and tfRCPlane) = 0) and (Gear^.Timer > 0) then dec(Gear^.Timer);
 if ((TrainingFlags and tfRCPlane) <> 0) and ((TrainingFlags and tfTimeTrial) <> 0 ) and (
 TimeTrialStartTime = 0) then TimeTrialStartTime := RealTicks;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 FollowGear := Gear;
 fChanged := false;
 if ((HHGear^.State and gstHHDriven) = 0) or (Gear^.Timer = 0) then
 begin
 procedure doStepRCPlane(Gear: PGear);
 var
 HHGear: PGear;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Message := 0;
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.Angle := HHGear^.Angle;
 Gear^.Tag := hwSign(HHGear^.dX);
 if HHGear^.dX.isNegative then Gear^.Angle := 4096 - Gear^.Angle;
 bubble: PVisualGear;
 begin
 isUnderwater:= cWaterLine < hwRound(Gear^.Y) + Gear^.Radius;
 if Gear^.Pos > 0 then dec(Gear^.Pos);
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 //dec(Gear^.Timer);
 move := _0_2;
 fuel := 50;
 (*if (HHGear^.Message and gmPrecise) <> 0 then
 begin
 HHGear: PGear;
 begin
 Gear^.Pos:= 0;
 Gear^.doStep := @doStepJetpackWork;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 FollowGear := HHGear;
 AfterAttack;
 with HHGear^ do
 begin
 State := State and not gstAttacking;
 doPortalColorSwitch();
 // destroy portal if ground it was attached too is gone
 if ((Land[hwRound(Gear^.Y), hwRound(Gear^.X)] and $FF00) = 0)
 or (Gear^.Timer < 1)
-or (PHedgehog(Gear^.Hedgehog) <> CurrentHedgehog)
+or (Gear^.Hedgehog <> CurrentHedgehog)
 or (hwRound(Gear^.Y) > cWaterLine) then
 begin
 deleteGear(Gear);
 EXIT;
 end;
 procedure doStepMovingPortal(Gear: PGear);
 begin
 doPortalColorSwitch();
 doStepPerPixel(Gear, @doStepMovingPortal_real, true);
 if (Gear^.Timer < 1)
-or (PHedgehog(Gear^.Hedgehog) <> CurrentHedgehog) then
+or (Gear^.Hedgehog <> CurrentHedgehog) then
 deleteGear(Gear);
 end;
 procedure doStepPortalShot(newPortal: PGear);
 var
 rx, ry, speed: hwFloat;
 i, gX, gY: LongInt;
 Fire: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HedgehogChAngle(HHGear);
 gX := hwRound(Gear^.X) + GetLaunchX(amBallgun, hwSign(HHGear^.dX), HHGear^.Angle);
 gY := hwRound(Gear^.Y) + GetLaunchY(amBallgun, HHGear^.Angle);
 if (GameTicks and $FF) = 0 then
 procedure doStepFlamethrower(Gear: PGear);
 var
 HHGear: PGear;
 begin
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 HHGear^.Message := HHGear^.Message and not (gmUp or gmDown or gmLeft or gmRight);
 HHGear^.State := HHGear^.State or gstNotKickable;
 Gear^.doStep := @doStepFlamethrowerWork
 end;
 procedure doStepHammer(Gear: PGear);
 var HHGear, tmp, tmp2: PGear;
 t: PGearArray;
 i: LongInt;
 begin
-HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear:= Gear^.Hedgehog^.Gear;
 HHGear^.State:= HHGear^.State or gstNoDamage;
 DeleteCI(HHGear);
 t:= CheckGearsCollision(Gear);
 var
 i, ei: LongInt;
 HHGear: PGear;
 begin
 AllInactive := false;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 dec(Gear^.Timer);
 if (HHGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then
 begin
 DeleteGear(Gear);
 exit
 i, y: LongInt;
 ar: TRangeArray;
 HHGear: PGear;
 begin
 i := 0;
-HHGear := PHedgehog(Gear^.Hedgehog)^.Gear;
+HHGear := Gear^.Hedgehog^.Gear;
 y := hwRound(Gear^.Y) - cHHRadius * 2;
 while y < hwRound(Gear^.Y) do
 begin
 ar[i].Left := hwRound(Gear^.X) - Gear^.Radius - LongInt(GetRandom(2));
 begin
 if (TurnTimeLeft > 0) then
 dec(TurnTimeLeft);
 AllInactive := false;
-hh := PHedgehog(Gear^.Hedgehog);
+hh := Gear^.Hedgehog;
 DrawCentered(hwRound(hh^.Gear^.X) + WorldDx, hwRound(hh^.Gear^.Y) + WorldDy -
 cHHRadius - 14 - hh^.HealthTagTex^.h, hh^.HealthTagTex);
 (*DrawCircle(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Radius, 1.5, 0, 0, $FF,
 $FF);*)

changeset 4365	4f2b1a152979
parent 4337	85e02b1a8e8f
child 4372	3836973380b9