hedgewars-draft: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:e944cc43f7a4
+:4f2b1a152979
 if (cWaterOpacity < $FF) and (hwRound(Gear^.Y) < cWaterLine + 256) then
 spawnHealthTagForHH(Gear, t);
 uStats.HedgehogDamaged(Gear)
 end;
-team:= PHedgehog(Gear^.Hedgehog)^.Team;
+team:= Gear^.Hedgehog^.Team;
 if CurrentHedgehog^.Gear = Gear then
 FreeActionsList; // to avoid ThinkThread on drawned gear
-PHedgehog(Gear^.Hedgehog)^.Gear:= nil;
+Gear^.Hedgehog^.Gear:= nil;
-if PHedgehog(Gear^.Hedgehog)^.King then
+if Gear^.Hedgehog^.King then
 begin
 // are there any other kings left? Just doing nil check.  Presumably a mortally wounded king will get reaped soon enough
 k:= false;
 for i:= 0 to Pred(team^.Clan^.TeamsNumber) do
 if (team^.Clan^.Teams[i]^.Hedgehogs[0].Gear <> nil) then k:= true;
 Gear^.Health:= 0
 end
 else
 dec(Gear^.Health, dmg);
-if (PHedgehog(Gear^.Hedgehog)^.Team = CurrentTeam) and
+if (Gear^.Hedgehog^.Team = CurrentTeam) and
 (Gear^.Damage <> Gear^.Karma) and
-not PHedgehog(Gear^.Hedgehog)^.King and
+not Gear^.Hedgehog^.King and
-not PHedgehog(Gear^.Hedgehog)^.Effects[hePoisoned] and
+not Gear^.Hedgehog^.Effects[hePoisoned] and
 not SuddenDeathDmg then
 Gear^.State:= Gear^.State or gstLoser;
 spawnHealthTagForHH(Gear, dmg);
-RenderHealth(PHedgehog(Gear^.Hedgehog)^);
+RenderHealth(Gear^.Hedgehog^);
-RecountTeamHealth(PHedgehog(Gear^.Hedgehog)^.Team);
+RecountTeamHealth(Gear^.Hedgehog^.Team);
 end;
 if (not isInMultiShoot) then Gear^.Karma:= 0;
 Gear^.Damage:= 0
 end;
 while Gear <> nil do
 begin
 if Gear^.Kind = gtHedgehog then
 begin
 tmp:= 0;
-if PHedgehog(Gear^.Hedgehog)^.Effects[hePoisoned] then
+if Gear^.Hedgehog^.Effects[hePoisoned] then
 begin
 inc(tmp, ModifyDamage(5, Gear));
-if (GameFlags and gfResetHealth) <> 0 then dec(PHedgehog(Gear^.Hedgehog)^.InitialHealth)  // does not need a minimum check since <= 1 basically disables it
+if (GameFlags and gfResetHealth) <> 0 then dec(Gear^.Hedgehog^.InitialHealth)  // does not need a minimum check since <= 1 basically disables it
 end;
 if (TotalRounds > cSuddenDTurns - 1) then
 begin
 inc(tmp, cHealthDecrease);
-if (GameFlags and gfResetHealth) <> 0 then dec(PHedgehog(Gear^.Hedgehog)^.InitialHealth, cHealthDecrease)
+if (GameFlags and gfResetHealth) <> 0 then dec(Gear^.Hedgehog^.InitialHealth, cHealthDecrease)
 end;
-if PHedgehog(Gear^.Hedgehog)^.King then
+if Gear^.Hedgehog^.King then
 begin
 flag:= false;
-team:= PHedgehog(Gear^.Hedgehog)^.Team;
+team:= Gear^.Hedgehog^.Team;
 for i:= 0 to Pred(team^.HedgehogsNumber) do
 if (team^.Hedgehogs[i].Gear <> nil) and
 (not team^.Hedgehogs[i].King) and
 (team^.Hedgehogs[i].Gear^.Health > team^.Hedgehogs[i].Gear^.Damage)
 then flag:= true;
 if not flag then
 begin
 inc(tmp, 5);
-if (GameFlags and gfResetHealth) <> 0 then dec(PHedgehog(Gear^.Hedgehog)^.InitialHealth, 5)
+if (GameFlags and gfResetHealth) <> 0 then dec(Gear^.Hedgehog^.InitialHealth, 5)
 end
 end;
 if tmp > 0 then
 begin
 inc(Gear^.Damage, min(tmp, max(0,Gear^.Health - 1 - Gear^.Damage)));
 vg: PVisualGear;
 begin
 if (Gear^.Kind = gtHedgehog) and (Damage>=1) then
 begin
 HHHurt(Gear^.Hedgehog, Source);
-AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), Damage, PHedgehog(Gear^.Hedgehog)^.Team^.Clan^.Color);
+AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), Damage, Gear^.Hedgehog^.Team^.Clan^.Color);
 tmpDmg:= min(Damage, max(0,Gear^.Health-Gear^.Damage));
 if (Gear <> CurrentHedgehog^.Gear) and (CurrentHedgehog^.Gear <> nil) and (tmpDmg >= 1) then
 begin
 if cVampiric then
 begin
 end
 end;
 procedure DrawAltWeapon(Gear: PGear; sx, sy: LongInt);
 begin
-with PHedgehog(Gear^.Hedgehog)^ do
+with Gear^.Hedgehog^ do
 begin
 if not (((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and ((Gear^.State and gstAttacked) = 0)) then
 exit;
 DrawTexture(sx + 16, sy + 16, ropeIconTex);
 DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.75, sx + 30, sy + 30, ord(CurAmmoType) - 1, 1, 32, 32);
 begin
 with RopePoints do
 begin
 rounded[Count].X:= hwRound(Gear^.X);
 rounded[Count].Y:= hwRound(Gear^.Y);
-rounded[Count + 1].X:= hwRound(PHedgehog(Gear^.Hedgehog)^.Gear^.X);
+rounded[Count + 1].X:= hwRound(Gear^.Hedgehog^.Gear^.X);
-rounded[Count + 1].Y:= hwRound(PHedgehog(Gear^.Hedgehog)^.Gear^.Y);
+rounded[Count + 1].Y:= hwRound(Gear^.Hedgehog^.Gear^.Y);
 end;
 if (RopePoints.Count > 0) or (Gear^.Elasticity.QWordValue > 0) then
 begin
 glDisable(GL_TEXTURE_2D);
 inc(i)
 end;
 DrawRopeLine(hwRound(RopePoints.ar[i].X) + WorldDx, hwRound(RopePoints.ar[i].Y) + WorldDy,
 hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy);
 DrawRopeLine(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy,
-hwRound(PHedgehog(Gear^.Hedgehog)^.Gear^.X) + WorldDx, hwRound(PHedgehog(Gear^.Hedgehog)^.Gear^.Y) + WorldDy);
+hwRound(Gear^.Hedgehog^.Gear^.X) + WorldDx, hwRound(Gear^.Hedgehog^.Gear^.Y) + WorldDy);
 end else
 if Gear^.Elasticity.QWordValue > 0 then
 DrawRopeLine(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy,
-hwRound(PHedgehog(Gear^.Hedgehog)^.Gear^.X) + WorldDx, hwRound(PHedgehog(Gear^.Hedgehog)^.Gear^.Y) + WorldDy);
+hwRound(Gear^.Hedgehog^.Gear^.X) + WorldDx, hwRound(Gear^.Hedgehog^.Gear^.Y) + WorldDy);
 end;
 if RopePoints.Count > 0 then
 DrawRotated(sprRopeHook, hwRound(RopePoints.ar[0].X) + WorldDx, hwRound(RopePoints.ar[0].Y) + WorldDy, 1, RopePoints.HookAngle)
 Gear^.State:= (Gear^.State or gstMoving) and (not gstWinner);
 Gear^.Active:= true;
 if Gear^.Kind <> gtFlame then FollowGear:= Gear
 end;
 if ((Mask and EXPLPoisoned) <> 0) and (Gear^.Kind = gtHedgehog) then
-PHedgehog(Gear^.Hedgehog)^.Effects[hePoisoned] := true;
+Gear^.Hedgehog^.Effects[hePoisoned] := true;
 end;
 end;
 gtGrave: begin
 // Run the calcs only once we know we have a type that will need damage
 else
 Gear^.State:= Gear^.State or gstWinner;
 if (Gear^.Kind = gtExplosives) and (Ammo^.Kind = gtBlowtorch) then ApplyDamage(Gear, tmpDmg * 100, dsUnknown); // crank up damage for explosives + blowtorch
 DeleteCI(Gear);
-if (Gear^.Kind = gtHedgehog) and PHedgehog(Gear^.Hedgehog)^.King then
+if (Gear^.Kind = gtHedgehog) and Gear^.Hedgehog^.King then
 begin
 Gear^.dX:= Ammo^.dX * Power * _0_005;
 Gear^.dY:= Ammo^.dY * Power * _0_005
 end
 else
 {$ENDIF}
 end
 else
 begin
 OutError('Can''t find place for Gear', false);
-if Gear^.Kind = gtHedgehog then PHedgehog(Gear^.Hedgehog)^.Effects[heResurrectable] := false;
+if Gear^.Kind = gtHedgehog then Gear^.Hedgehog^.Effects[heResurrectable] := false;
 DeleteGear(Gear);
 Gear:= nil
 end
 end;
 Not without a new damage machine.
 King check should be in here instead of ApplyDamage since Tiy wants them kicked less
 *)
 i:= _1;
 if (CurrentHedgehog <> nil) and CurrentHedgehog^.King then i:= _1_5;
-if (Gear^.Hedgehog <> nil) and (PHedgehog(Gear^.Hedgehog)^.King) then
+if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.King) then
 ModifyDamage:= hwRound(_0_01 * cDamageModifier * dmg * i * cDamagePercent * _0_5)
 else
 ModifyDamage:= hwRound(_0_01 * cDamageModifier * dmg * i * cDamagePercent)
 end;

changeset 4365	4f2b1a152979
parent 4359	83ef50815535
child 4367	f4a0ec067601