hedgewars-draft: comparison hedgewars/HHHandlers.inc

equal deleted inserted replaced

-:e944cc43f7a4
+:4f2b1a152979
 ammoidx: LongInt;
 begin
 ChangeAmmo:= false;
 slot:= Gear^.MsgParam;
-with PHedgehog(Gear^.Hedgehog)^ do
+with Gear^.Hedgehog^ do
 begin
 Gear^.Message:= Gear^.Message and not gmSlot;
 ammoidx:= 0;
 if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or
 (TargetPoint.X <> NoPointX) or
 ((Gear^.State and gstHHDriven) = 0) then exit;
 ChangeAmmo:= true;
 while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx);
-if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(PHedgehog(Gear^.Hedgehog)^);
+if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(Gear^.Hedgehog^);
 MultiShootAttacks:= 0;
 Gear^.Message:= Gear^.Message and not (gmLJump or gmHJump);
 if Ammoz[CurAmmoType].Slot = slot then
 weap: TAmmoType;
 Hedgehog: PHedgehog;
 s: boolean;
 begin
 weap:= TAmmoType(Gear^.MsgParam);
-Hedgehog:= PHedgehog(Gear^.Hedgehog);
+Hedgehog:= Gear^.Hedgehog;
 if Hedgehog^.Team^.Clan^.TurnNumber <= Ammoz[weap].SkipTurns then exit; // weapon is not activated yet
 Gear^.MsgParam:= Ammoz[weap].Slot;
 begin
 s:= ChangeAmmo(Gear);
 dec(t)
 end;
-if s then ApplyAmmoChanges(PHedgehog(Gear^.Hedgehog)^)
+if s then ApplyAmmoChanges(Gear^.Hedgehog^)
 end;
 procedure HHSetTimer(Gear: PGear);
 var CurWeapon: PAmmo;
 begin
 Gear^.Message:= Gear^.Message and not gmTimer;
-CurWeapon:= GetAmmoEntry(PHedgehog(Gear^.Hedgehog)^);
+CurWeapon:= GetAmmoEntry(Gear^.Hedgehog^);
-with PHedgehog(Gear^.Hedgehog)^ do
+with Gear^.Hedgehog^ do
 if (CurWeapon^.Propz and ammoprop_Timerable) <> 0 then
 begin
 CurWeapon^.Timer:= 1000 * Gear^.MsgParam;
 with CurrentTeam^ do
 ApplyAmmoChanges(Hedgehogs[CurrHedgehog]);
 tmpGear: PVisualGear;
 CurWeapon: PAmmo;
 altUse: boolean;
 begin
 bShowFinger:= false;
-CurWeapon:= GetAmmoEntry(PHedgehog(Gear^.Hedgehog)^);
+CurWeapon:= GetAmmoEntry(Gear^.Hedgehog^);
 with Gear^,
-PHedgehog(Gear^.Hedgehog)^ do
+Gear^.Hedgehog^ do
 begin
 if ((State and gstHHDriven) <> 0)and
 ((State and (gstAttacked or gstHHChooseTarget)) = 0) and
 (((State and gstMoving) = 0) or
 // Allow attacks while moving on ammo with AltAttack
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepHedgehogDead(Gear: PGear);
 const frametime = 200;
 timertime = frametime * 6;
 begin
-if PHedgehog(Gear^.Hedgehog)^.Unplaced then exit;
+if Gear^.Hedgehog^.Unplaced then exit;
 if Gear^.Timer > 1 then
 begin
 AllInactive:= false;
 dec(Gear^.Timer);
 if (Gear^.Timer mod frametime) = 0 then inc(Gear^.Pos)
 begin
 AllInactive:= false;
 Gear^.Z:= cCurrHHZ;
 RemoveGearFromList(Gear);
 InsertGearToList(Gear);
-PlaySound(sndByeBye, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+PlaySound(sndByeBye, Gear^.Hedgehog^.Team^.voicepack);
 Gear^.Pos:= 0;
 Gear^.Timer:= timertime
 end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepHedgehogGone(Gear: PGear);
 const frametime = 65;
 timertime = frametime * 11;
 begin
-if PHedgehog(Gear^.Hedgehog)^.Unplaced then exit;
+if Gear^.Hedgehog^.Unplaced then exit;
 if Gear^.Timer > 1 then
 begin
 AllInactive:= false;
 dec(Gear^.Timer);
 if (Gear^.Timer mod frametime) = 0 then inc(Gear^.Pos)
 begin
 AllInactive:= false;
 Gear^.Z:= cCurrHHZ;
 RemoveGearFromList(Gear);
 InsertGearToList(Gear);
-PlaySound(sndByeBye, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+PlaySound(sndByeBye, Gear^.Hedgehog^.Team^.voicepack);
 PlaySound(sndWarp);
 Gear^.Pos:= 0;
 Gear^.Timer:= timertime
 end
 end;
 procedure HedgehogStep(Gear: PGear);
 var PrevdX: LongInt;
 CurWeapon: PAmmo;
 begin
-CurWeapon:= GetAmmoEntry(PHedgehog(Gear^.Hedgehog)^);
+CurWeapon:= GetAmmoEntry(Gear^.Hedgehog^);
 if ((Gear^.State and (gstAttacking or gstMoving)) = 0) then
 begin
 if isCursorVisible then
-with PHedgehog(Gear^.Hedgehog)^ do
+with Gear^.Hedgehog^ do
 with CurWeapon^ do
 begin
 if (Gear^.Message and gmLeft  ) <> 0 then
 Pos:= (Pos - 1 + Ammoz[AmmoType].PosCount) mod Ammoz[AmmoType].PosCount
 else
 or   TestCollisionYwithGear(Gear, -1)) then
 begin
 Gear^.dY:= -_0_15;
 if not cArtillery then Gear^.dX:= SignAs(_0_15, Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
-PlaySound(sndJump1, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+PlaySound(sndJump1, Gear^.Hedgehog^.Team^.voicepack);
 exit
 end;
 end;
 if ((Gear^.Message and gmHJump ) <> 0) then
 Gear^.Message:= Gear^.Message and not gmHJump;
 Gear^.dY:= -_0_2;
 SetLittle(Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
-PlaySound(sndJump3, PHedgehog(Gear^.Hedgehog)^.Team^.voicepack);
+PlaySound(sndJump3, Gear^.Hedgehog^.Team^.voicepack);
 exit
 end;
 PrevdX:= hwSign(Gear^.dX);
 if (Gear^.Message and gmLeft  )<>0 then Gear^.dX:= -cLittle else
 FollowGear:= Gear;
 exit
 end;
 DeleteCI(Gear); // must be after exit!! (see previous line)
-PHedgehog(Gear^.Hedgehog)^.visStepPos:= (PHedgehog(Gear^.Hedgehog)^.visStepPos + 1) and 7;
+Gear^.Hedgehog^.visStepPos:= (Gear^.Hedgehog^.visStepPos + 1) and 7;
 if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then
 begin
 if not (TestCollisionXwithXYShift(Gear, _0, -6, hwSign(Gear^.dX))
 or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - _1;
 if not (TestCollisionXwithXYShift(Gear, _0, -5, hwSign(Gear^.dX))
 end;
 procedure HedgehogChAngle(Gear: PGear);
 var da: LongWord;
 begin
-with PHedgehog(Gear^.Hedgehog)^ do
+with Gear^.Hedgehog^ do
 if (CurAmmoType = amRope)
 and ((Gear^.State and (gstMoving or gstHHJumping)) = gstMoving) then da:= 2 else da:= 1;
 if (((Gear^.Message and gmPrecise) = 0) or ((GameTicks mod 5) = 1)) then
 if ((Gear^.Message and gmUp) <> 0) and (Gear^.Angle >= CurMinAngle + da) then dec(Gear^.Angle, da)
 begin
 isUnderwater:= cWaterLine < hwRound(Gear^.Y) + Gear^.Radius;
 if Gear^.dX.QWordValue > 8160437862 then Gear^.dX.QWordValue:= 8160437862;
 if Gear^.dY.QWordValue > 8160437862 then Gear^.dY.QWordValue:= 8160437862;
-if PHedgehog(Gear^.Hedgehog)^.Unplaced then
+if Gear^.Hedgehog^.Unplaced then
 begin
 Gear^.dY:= _0;
 Gear^.dX:= _0;
 Gear^.State:= Gear^.State and not gstMoving;
 exit
 procedure doStepHedgehogDriven(Gear: PGear);
 var t: PGear;
 wasJumping: boolean;
 Hedgehog: PHedgehog;
 begin
-Hedgehog:= PHedgehog(Gear^.Hedgehog);
+Hedgehog:= Gear^.Hedgehog;
 if not isInMultiShoot then
 AllInactive:= false
 else
 Gear^.Message:= 0;
 Gear^.Timer:= 0;
 FollowGear:= Gear;
 PrvInactive:= false;
 AllInactive:= false;
-if not PHedgehog(Gear^.Hedgehog)^.Team^.hasGone then
+if not Gear^.Hedgehog^.Team^.hasGone then
 begin
-PHedgehog(Gear^.Hedgehog)^.Effects[hePoisoned] := false;
+Gear^.Hedgehog^.Effects[hePoisoned] := false;
-if PHedgehog(Gear^.Hedgehog)^.Effects[heResurrectable] then begin
+if Gear^.Hedgehog^.Effects[heResurrectable] then begin
 ResurrectHedgehog(Gear);
 end else begin
 Gear^.State:= Gear^.State or gstHHDeath;
 Gear^.doStep:= @doStepHedgehogDead;
 // Death message
-AddCaption(Format(GetEventString(eidDied), PHedgehog(Gear^.Hedgehog)^.Name), cWhiteColor, capgrpMessage);
+AddCaption(Format(GetEventString(eidDied), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
 end;
 end
 else
 begin
 Gear^.State:= Gear^.State or gstHHGone;
 Gear^.doStep:= @doStepHedgehogGone;
 // Gone message
-AddCaption(Format(GetEventString(eidGone), PHedgehog(Gear^.Hedgehog)^.Name), cWhiteColor, capgrpMessage);
+AddCaption(Format(GetEventString(eidGone), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage);
 end
 end;
 exit
 end;
 if (Gear^.State and gstHHDriven) = 0 then
 doStepHedgehogFree(Gear)
 else
 begin
-with PHedgehog(Gear^.Hedgehog)^ do
+with Gear^.Hedgehog^ do
 if Team^.hasGone then TeamGoneEffect(Team^);
 doStepHedgehogDriven(Gear)
 end;
 end;

changeset 4365	4f2b1a152979
parent 4301	4866cc130b8d
child 4372	3836973380b9