hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:99f05a01a6a3
+:ece7b87f1334
 Gear^.Y:= Gear^.Y + cDrownSpeed;
 Gear^.X:= Gear^.X + Gear^.dX * cDrownSpeed;
 if hwRound(Gear^.Y) > Gear^.Radius + cWaterLine + cVisibleWater then DeleteGear(Gear);
 // Create some bubbles (0.5% might be better but causes too few bubbles sometimes)
 if (GameTicks and $1F) = 0 then
 if (Gear^.Kind = gtHedgehog) and (Random(4) = 0) then
 AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble)
 else if Random(12) = 0 then
 AddVisualGear(hwRound(Gear^.X) - Gear^.Radius, hwRound(Gear^.Y) - Gear^.Radius, vgtBubble)
 end;
 PlaySound(sndGun, false, nil);
 Gear^.doStep:= @doStepBulletWork;
 end
 else
 if (GameTicks mod 32) = 0 then
 if (GameTicks mod 4096) < 2048 then
 begin
 if(HHGear^.Angle + 1 <= cMaxAngle) then inc(HHGear^.Angle)
 end
 else
 if(HHGear^.Angle - 1 >= 0) then dec(HHGear^.Angle);
 if (TurnTimeLeft > 0) then
 dec(TurnTimeLeft)
 else
 begin
 PHedgehog(Gear^.Hedgehog)^.AttacksNum:= Gear^.Ammo^.NumPerTurn+1;
 	DeleteGear(Gear);
 	if ((HHGear^.State and gstMoving) = 0) then
 		begin
 		HHGear^.State:= HHGear^.State and not gstAttacking;
 		prevX:= hwRound(HHGear^.X);
 // why the call to HedgehogStep then a further increment of X?
 if (prevX = hwRound(HHGear^.X)) and
 CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y), COLOR_INDESTRUCTIBLE) then HedgehogStep(HHGear);
 if (prevX = hwRound(HHGear^.X)) and
 CheckLandValue(hwRound(HHGear^.X + SignAs(_6, HHGear^.dX)), hwRound(HHGear^.Y), COLOR_INDESTRUCTIBLE) then HHGear^.X:= HHGear^.X + SignAs(_1, HHGear^.dX);
 		HHGear^.State:= HHGear^.State or gstAttacking
 		end;
 	inc(BTSteps);
 	begin
 	Gear^.X:= HHGear^.X;
 	Gear^.Y:= HHGear^.Y;
 	ApplyAngleBounds(PHedgehog(Gear^.Hedgehog)^, amRope);
 	Gear^.dX:= SignAs(AngleSin(HHGear^.Angle), HHGear^.dX);
 	Gear^.dY:= -AngleCos(HHGear^.Angle);
 	Gear^.Friction:= _450;
 	Gear^.Elasticity:= _0;
 	Gear^.State:= Gear^.State and not gsttmpflag;
 	haveDivided:= false;
 	// check whether rope needs dividing
 	len:= _1 / Distance(ropeDx, ropeDy); // old rope pos
 	nx:= ropeDx * len;
 	ny:= ropeDy * len;
 	len:= Gear^.Elasticity - _0_3x70;
 	while len > _3 do
 			begin
 			lx:= hwRound(Gear^.X + mdX * len);
 			ly:= hwRound(Gear^.Y + mdY * len);
 				with RopePoints.rounded[RopePoints.Count] do
 					begin
 					X:= hwRound(Gear^.X);
 					Y:= hwRound(Gear^.Y);
 					end;
 				Gear^.X:= Gear^.X + nx * len;
 				Gear^.Y:= Gear^.Y + ny * len;
 				inc(RopePoints.Count);
 				TryDo(RopePoints.Count <= MAXROPEPOINTS, 'Rope points overflow', true);
 				Gear^.Elasticity:= Gear^.Elasticity - len;
 		OnUsedAmmo(PHedgehog(HHGear^.Hedgehog)^);
 		Gear^.State:= Gear^.State or gstAttacked
 		end;
 	ApplyAmmoChanges(PHedgehog(HHGear^.Hedgehog)^)
 	end;
 begin
 Gear^.X:= Gear^.X - Gear^.dX;
 Gear^.Y:= Gear^.Y - Gear^.dY;
 Gear^.Elasticity:= Gear^.Elasticity + _1;
 HHGear:= PHedgehog(Gear^.Hedgehog)^.Gear;
 DeleteCI(HHGear);
 if (HHGear^.State and gstMoving) <> 0 then
 	begin
 	if TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then SetLittle(HHGear^.dX);
 	if HHGear^.dY.isNegative and TestCollisionYwithGear(HHGear, -1) then HHGear^.dY:= _0;
 	HHGear^.X:= HHGear^.X + HHGear^.dX;
 	Gear^.X:= Gear^.X + HHGear^.dX;
 	if TestCollisionYwithGear(HHGear, 1) then
 		begin
 				Gear^.X:= Gear^.X + tx;
 				Gear^.Y:= Gear^.Y + ty;
 				Gear^.Elasticity:= tt;
 				Gear^.doStep:= @doStepRopeWork;
 				with HHGear^ do State:= State and not (gstAttacking or gstHHJumping or gstHHHJump);
 				RemoveFromAmmo;
 				tt:= _0;
 				exit
 				end;
 			tx:= tx + Gear^.dX + Gear^.dX;
 			ty:= ty + Gear^.dY + Gear^.dY;
 		begin
 		Gear^.doStep:= @doStepRopeWork;
 		with HHGear^ do State:= State and not (gstAttacking or gstHHJumping or gstHHHJump);
 		RemoveFromAmmo;
 		exit
 		end;
 if (Gear^.Elasticity > Gear^.Friction)
 or ((Gear^.Message and gm_Attack) = 0)
 	begin
 	x:= hwRound(Gear^.X);
 	y:= hwRound(Gear^.Y);
 	k:= Gear^.Kind;
 	DeleteGear(Gear); // <-- delete gear!
 	if k = gtCase then
 		begin
 		doMakeExplosion(x, y, 25, EXPLAutoSound);
 		for i:= 0 to 63 do
 			AddGear(x, y, gtFlame, 0, _0, _0, 0);
 	if hwAbs(Gear^.dX) > _0_01 then
 		Gear^.dX:= Gear^.dX * _0_995;
 	Gear^.dY:= Gear^.dY + cGravity;
 	if hwAbs(Gear^.dY) > _0_2 then Gear^.dY:= Gear^.dY * _0_995;
 	Gear^.X:= Gear^.X + Gear^.dX + cWindSpeed * 640;
 	Gear^.Y:= Gear^.Y + Gear^.dY;
 	if (hwRound(Gear^.Y) > cWaterLine) then
 		begin
 		for i:= 0 to 3 do
 			begin
 			AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 16 + Random(16), vgtSteam);
 	DeleteGear(Gear);
 	AfterAttack;
 	exit
 	end;
 if CheckLandValue(hwRound(HHGear^.X), hwRound(HHGear^.Y + HHGear^.dY + SignAs(_6,Gear^.dY)), COLOR_INDESTRUCTIBLE) then
 HHGear^.Y:= HHGear^.Y + HHGear^.dY
 end;
 procedure doStepFirePunch(Gear: PGear);
 var HHGear: PGear;
 		begin
 		dX:= Gear^.dX + (GetRandom - _0_5) * _0_03;
 		dY:= Gear^.dY + (GetRandom - _0_5) * _0_03;
 		AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtCluster, 0, dX, dY, 25);
 		end;
 	DeleteGear(Gear);
 	exit
 	end;
 if (GameTicks and $3F) = 0 then
 inc(upd);
 if upd > 3 then
 	begin
 	if Gear^.Health < 1500 then Gear^.Pos:= 2;
 	AmmoShove(Gear, 30, 40);
 	DrawTunnel(HHGear^.X - HHGear^.dX * 10,
 			HHGear^.Y - _2 - HHGear^.dY * 10 + hwAbs(HHGear^.dY) * 2,
 			HHGear^.dX,
 			HHGear^.dY,
 			20 + cHHRadius * 2,
 			cHHRadius * 2 + 6);
 	upd:= 0
 	end;
 if Gear^.Health < Gear^.Damage then
 	begin
 	procedure PrevAngle;
 	begin
 	Gear^.Angle:= (LongInt(Gear^.Angle) + 4 - dA) mod 4
 	end;
 	procedure NextAngle;
 	begin
 	Gear^.Angle:= (LongInt(Gear^.Angle) + 4 + dA) mod 4
 	end;
 begin
 AllInactive:= false;
 inc(Gear^.Tag);
 if Gear^.Tag < 7 then exit;
 	end else begin //explode right on contact with HH
 		doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, EXPLAutoSound);
 		DeleteGear(Gear);
 		exit;
 		end;
 	Gear^.doStep:= @doStepDrillDrilling;
 	dec(Gear^.Timer)
 	end
 end;
 	HedgehogChAngle(HHGear);
 	if (Gear^.Timer mod 100) = 0 then
 		begin
 		rx:= rndSign(getRandom * _0_1);
 		ry:= rndSign(getRandom * _0_1);
 		AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtBall, 0,
 				SignAs(AngleSin(HHGear^.Angle) * _0_8, HHGear^.dX) + rx,
 				AngleCos(HHGear^.Angle) * ( - _0_8) + ry,
 				0);
 		PlaySound(sndGun, false, nil);
 		end;
 	if (Gear^.Timer = 0) or (HHGear^.Damage <> 0) then
 		begin
 	or CheckGearDrowning(Gear) then
 	begin
 	StopSound(sndRCPlane);
 	StopSound(sndRideOfTheValkyries);
 	ResumeMusic;
 	if ((Gear^.State and gstCollision) <> 0) then
 		begin
 		doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 25, EXPLAutoSound);
 		for i:= 0 to 32 do
 			begin
 dec(Gear^.Health, fuel div 5);
 Gear^.MsgParam:= Gear^.MsgParam or (HHGear^.Message and (gm_Left or gm_Right));
 Gear^.Timer:= GameTicks
 end;
 // erases them all at once :-/
 if (Gear^.Timer <> 0) and (GameTicks - Gear^.Timer > 250) then
 begin
 Gear^.Timer:= 0;
 Gear^.MsgParam:= 0
 end;
 if Gear^.Health < 0 then Gear^.Health:= 0;
 if (GameTicks and $3F) = 0 then
 begin
 //AddCaption('Fuel: '+inttostr(round(Gear^.Health/20))+'%', $FFFFFF, capgrpAmmostate);
 if Gear^.Tex <> nil then FreeTexture(Gear^.Tex);
 Gear^.Tex:= RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(round(Gear^.Health / 20)) + '%', $FFFFFFFF, fntSmall)
 end;
 if HHGear^.Message and (gm_Attack or gm_Up or gm_Precise or gm_Left or gm_Right) <> 0 then Gear^.State:= Gear^.State and not gsttmpFlag;
 HHGear^.Message:= HHGear^.Message and not (gm_Up or gm_Precise or gm_Left or gm_Right);
 HHGear^.State:= HHGear^.State or gstMoving;
 Gear^.X:= HHGear^.X;
 Gear^.Y:= HHGear^.Y;
 // For some reason I need to reapply followgear here, something else grabs it otherwise.
 if not bShowAmmoMenu then FollowGear:= HHGear;
 if ((Gear^.State and gsttmpFlag) = 0) or (HHGear^.dY < _0) then doStepHedgehogMoving(HHGear);
 if  (Gear^.Health = 0)
 or (HHGear^.Damage <> 0)
 	or CheckGearDrowning(HHGear)
 or (TurnTimeLeft = 0)
 // allow brief ground touches - to be fair on this, might need another counter
 or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and TestCollisionYwithGear(HHGear, 1))
 	or ((Gear^.Message and gm_Attack) <> 0) then
 	begin
 	with HHGear^ do

changeset 2376	ece7b87f1334
parent 2367	86c9aadea817
child 2424	b52344de23ae