hedgewars: comparison hedgewars/HHHandlers.inc

equal deleted inserted replaced

-:0ddb100fea61
+:f924be23ffb4
 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
 amGrenade: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtBomb,         0, newDx, newDy, CurWeapon^.Timer);
 amMolotov: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtMolotov,      0, newDx, newDy, 0);
 amClusterBomb: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtClusterBomb,  0, newDx, newDy, CurWeapon^.Timer);
 amGasBomb: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtGasBomb,      0, newDx, newDy, CurWeapon^.Timer);
 amBazooka: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtShell,        0, newDx, newDy, 0);
+amSnowball: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtSnowball,     0, newDx, newDy, 0);
 amBee: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtBee,          0, newDx, newDy, 0);
 amShotgun: begin
 PlaySound(sndShotgunReload);
 CurAmmoGear:= AddGear(hwRound(lx), hwRound(ly), gtShotgunShot,  0, xx * _0_5, yy * _0_5, 0);
 end;
 else
 AddGear(hwRound(lx) + hwSign(dX) * 7, hwRound(ly), gtMine, gstWait, SignAs(_0_02, dX), _0, 3000);
 amSMine: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtSMine,    0, xx*Power/cPowerDivisor, yy*Power/cPowerDivisor, 0);
 amDEagle: CurAmmoGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtDEagleShot, 0, xx * _0_5, yy * _0_5, 0);
 amSineGun: CurAmmoGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtSineGunShot, 0, xx * _0_5, yy * _0_5, 0);
-amPortalGun: AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtPortal, 0, xx * _0_6, yy * _0_6, 0);
+amPortalGun: begin
+AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtPortal, 0, xx * _0_6, yy * _0_6,
+// set selected color
+CurWeapon^.Pos);
+end;
 amSniperRifle: begin
 PlaySound(sndSniperReload);
 CurAmmoGear:= AddGear(hwRound(lx + xx * cHHRadius), hwRound(ly + yy * cHHRadius), gtSniperRifleShot, 0, xx * _0_5, yy * _0_5, 0);
 end;
 amDynamite: AddGear(hwRound(lx) + hwSign(dX) * 7, hwRound(ly), gtDynamite, 0, SignAs(_0_03, dX), _0, 5000);
 PlaySound(sndWhistle);
 CurAmmoGear:= AddGear(hwRound(lx), hwRound(ly) - 32, gtBirdy, 0, _0, _0, 0);
 end;
 amLowGravity: begin
 PlaySound(sndLowGravity);
-cGravity:= cMaxWindSpeed
+cGravity:= cMaxWindSpeed;
+cGravityf:= 0.00025
 end;
 amExtraDamage:begin
 PlaySound(sndHellishImpact4);
 cDamageModifier:= _1_5
 end;
 ////////////////////////////////////////////////////////////////////////////////
 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;
 PlaySound(sndShotgunReload);
 case Gear^.Pos of
 posCaseUtility,
 posCaseAmmo: begin
 a:= Gear^.AmmoType;
-AddAmmo(PHedgehog(HH^.Hedgehog)^, a);
+AddAmmo(HH^.Hedgehog^, a);
 // Possibly needs to check shared clan ammo game flag once added.
 // On the other hand, no obvious reason that clan members shouldn't know what ammo another clan member picked up
-if (not (PHedgehog(HH^.Hedgehog)^.Team^.ExtDriven
+if (not (HH^.Hedgehog^.Team^.ExtDriven
-or (PHedgehog(HH^.Hedgehog)^.BotLevel > 0)))
+or (HH^.Hedgehog^.BotLevel > 0)))
-or (PHedgehog(HH^.Hedgehog)^.Team^.Clan^.ClanIndex = LocalClan)
+or (HH^.Hedgehog^.Team^.Clan^.ClanIndex = LocalClan)
 or (GameType = gmtDemo)  then
 begin
 s:= trammo[Ammoz[a].NameId] + ' (+' + IntToStr(Ammoz[a].NumberInCase) + ')';
-AddCaption(s, PHedgehog(HH^.Hedgehog)^.Team^.Clan^.Color, capgrpAmmoinfo);
+AddCaption(s, HH^.Hedgehog^.Team^.Clan^.Color, capgrpAmmoinfo);
 // show ammo icon
 vga:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtAmmo);
 if vga <> nil then
 vga^.Frame:= Longword(a);
 end;
 end;
 posCaseHealth: begin
 inc(HH^.Health, Gear^.Health);
-PHedgehog(HH^.Hedgehog)^.Effects[hePoisoned] := false;
+HH^.Hedgehog^.Effects[hePoisoned] := false;
 str(Gear^.Health, s);
 s:= '+' + s;
-AddCaption(s, PHedgehog(HH^.Hedgehog)^.Team^.Clan^.Color, capgrpAmmoinfo);
+AddCaption(s, HH^.Hedgehog^.Team^.Clan^.Color, capgrpAmmoinfo);
-RenderHealth(PHedgehog(HH^.Hedgehog)^);
+RenderHealth(HH^.Hedgehog^);
-RecountTeamHealth(PHedgehog(HH^.Hedgehog)^.Team);
+RecountTeamHealth(HH^.Hedgehog^.Team);
 i:= 0;
 while i < Gear^.Health do
 begin
 AddVisualGear(hwRound(HH^.X), hwRound(HH^.Y), vgtHealth);
 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
 else
 begin
 Gear^.dY:= Gear^.dY + cGravity;
 // this set of circumstances could be less complex if jumping was more clearly identified
 if ((GameFlags and gfMoreWind) <> 0) and
-(Gear^.Damage <> 0) or
+(((Gear^.Damage <> 0) or
 ((CurAmmoGear <> nil) and
 ((CurAmmoGear^.AmmoType = amJetpack) or
 (CurAmmoGear^.AmmoType = amBirdy))) or
-((Gear^.dY.QWordValue + Gear^.dX.QWordValue) > _0_55.QWordValue)
+((Gear^.dY.QWordValue + Gear^.dX.QWordValue) > _0_55.QWordValue)))
-then Gear^.dX := Gear^.dX + cWindSpeed * _0_2
+then Gear^.dX := Gear^.dX + cWindSpeed / Gear^.Density
 end
 end
 else
 begin
 if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_55.QWordValue)
 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;

branch	experimental3D
changeset 4812	f924be23ffb4
parent 4790	4cb3f7890fbd
child 4824	efbc8f80acac