sheepy-clone: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:095273ad0e08
+:e5b3e5f2818e
 var isFalling: boolean;
 //tmp: QWord;
 tdX, tdY: hwFloat;
 collV, collH: LongInt;
 begin
+if Gear^.dX > _0_995 then Gear^.dX:= _0_995;
+if Gear^.dY > _0_995 then Gear^.dY:= _0_995;
 Gear^.State:= Gear^.State and not gstCollision;
 collV:= 0;
 collH:= 0;
 tdX:= Gear^.dX;
 tdY:= Gear^.dY;
 begin
 HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
 DeleteCI(HHGear);
-OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
+AfterAttack;
-ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^);
 HHGear^.State:= HHGear^.State and not (gstAttacking or gstAttacked or gstMoving);
 HHGear^.Message:= HHGear^.Message and not gm_Attack;
 Gear^.doStep:= @doStepParachuteWork;
 DeleteGear(Gear)
 end
 else begin
 PlaySound(sndPlaced);
 DeleteGear(Gear);
-OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
+AfterAttack;
-ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^)
 end;
 HHGear^.State:= HHGear^.State and not (gstAttacking or gstAttacked);
 HHGear^.Message:= HHGear^.Message and not gm_Attack;
 TargetPoint.X:= NoPointX
 if ((Gear^.Message and not gm_Switch) <> 0) or (TurnTimeLeft = 0) then
 begin
 HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
 Msg:= Gear^.Message and not gm_Switch;
 DeleteGear(Gear);
-OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
+AfterAttack;
-ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^);
 HHGear:= CurrentHedgehog^.Gear;
 ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^);
 HHGear^.Message:= Msg;
 exit
 begin
 Gear^.doStep:= @doStepJetpackWork;
 HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
 FollowGear:= HHGear;
-OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
+AfterAttack;
-ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^);
 with HHGear^ do
 begin
 State:= State and not gstAttacking;
 Message:= Message and not (gm_Attack or gm_Up or gm_Precise or gm_Left or gm_Right);
 if (dY < _0_1) and (dY > -_0_1) then
 end;
 end;
 procedure doStepPortal(Gear: PGear);
 begin
+if Gear^.IntersectGear <> nil then
+begin
+// do portal stuff
+end
 (*
-A portal will have a few things it does.
-1) At first, it will move through the air until it collides with a surface. Once it does, it will stop.  At this point we might try a check to verify there is enough terrain for it to be spawned against, and delete. Or we could just let it kinda stick out for now.
 2) From then on, if doStepPortal is called and a gear of a radius less than or equal to the portal is within X pixels of the portal (we could also check on moving toward the portal I guess, depends how accurate this needs to be) the portal will then locate the first other portal of the opposite type (there should only be one other one), and move that gear's X/Y to that other portal's location, and modify dX/dY to be relative to that other portal's orientation relative to this portal's orientation.  This might require some tweaking with offsets of a few pixels to avoid getting gears stuck in land.
-3) At end of turn, all gtPortal will be deleted.
 *)
-(*
-Ok. Here's where I plan to go with this.
-1) Restrict portal gun to X shots.
-2) If on first shot, delete all existing gtPortal
-3) On any other shot, delete any existing portals of type X%2, and spawn a new portal of type X%2 oriented at angle 180° from the portal gun.  It might possibly be worth linking portals with a Gear reference, to save time on scanning through the Gear list every time we need a portal.
-*)
 end;
 procedure doStepMovingPortal(Gear: PGear);
-var i, x, y: LongInt;
+var x, y: LongInt;//, tx, ty, bx, by, tangle: LongInt;
-oX, oY: hwFloat;
+begin
-begin
-oX:= Gear^.X;
-oY:= Gear^.Y;
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.Y:= Gear^.Y + Gear^.dY;
 x:= hwRound(Gear^.X);
 y:= hwRound(Gear^.Y);
+if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and ((Land[y, x] and $FF00) <> 0) then
+begin
 (*
-Potential issue, portals embedded in land?
+This is not quite doing what I want, but basically hoping to avoid portals just sitting out in midair
-Also, will need checks on how well portal is placed
+Works ok for right angles, aaaand that's about it.
-Thought is possibly doing it based on midpoint and two ends, so a bit of rough terrain is still permitted, but not curves.
+The opposite approach could be taken, we could determine the angle of the land using sheepluva's code and snap the Angle/DirAngle to it.
+tangle:= Gear^.Angle+1024;
+if tangle > 2048 then dec(tangle,2048);
+tx:= hwRound(Gear^.X+SignAs(AngleSin(tangle), Gear^.dX)*_6);
+ty:= hwRound(Gear^.Y-AngleCos(tangle)*_6);
+bx:= hwRound(Gear^.X-SignAs(AngleSin(tangle), Gear^.dX)*_6);
+by:= hwRound(Gear^.Y+AngleCos(tangle)*_6);
 *)
-if ((y and LAND_HEIGHT_MASK) = 0) and ((x and LAND_WIDTH_MASK) = 0) and (Land[y, x] <> 0) then
+if ((Gear^.IntersectGear <> nil) and (hwRound(Distance(Gear^.X - Gear^.IntersectGear^.X,Gear^.Y-Gear^.IntersectGear^.Y)) < Gear^.Radius*2))
-begin
+(*or
-inc(Gear^.Tag);
+(((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and ((Land[ty, tx] and $FF00) = 0)) or
-Gear^.doStep:= @doStepPortal;
+(((by and LAND_HEIGHT_MASK) = 0) and ((bx and LAND_WIDTH_MASK) = 0) and ((Land[by, bx] and $FF00) = 0))*)
-//    AfterAttack;
+then
-end
+begin
-// How laser checks for infinite
+if CurrentHedgehog <> nil then
+if Gear^.IntersectGear = nil then CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 1
+else if Gear^.Tag = 2 then CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 2
+else CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 1;
+DeleteGear(Gear)
+end
+else
+begin
+if CurrentHedgehog <> nil then
+if Gear^.Tag = 2 then CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 1
+else CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 2;
+inc(Gear^.Tag);
+Gear^.doStep:= @doStepPortal
+end
+end
 else if (y > cWaterLine + cVisibleWater + Gear^.Radius) or (y < -LAND_WIDTH) or (x > LAND_WIDTH + LAND_WIDTH) or (x < -LAND_WIDTH) then
 begin
+if CurrentHedgehog <> nil then
+if Gear^.IntersectGear = nil then CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 1
+else if Gear^.Tag = 2 then CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 2
+else CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].Timer:= 1;
 DeleteGear(Gear);
-//    AfterAttack
 end;
 end;
 procedure doStepPiano(Gear: PGear);
 var r0, r1: LongInt;

changeset 3396	e5b3e5f2818e
parent 3391	77161719ec3c
child 3397	c47af0694a7d