hedgewars-draft: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:9bbf8af42ace
+:41d3afaa20c7
 			@doStepWaterUp,
 			@doStepDrill,
 			@doStepBallgun,
 			@doStepBomb,
 			@doStepRCPlane,
-			@doStepSpeechBubble
+			@doStepSpeechBubble,
+			@doStepSniperRifleShot
 			);
 procedure InsertGearToList(Gear: PGear);
 var tmp, ptmp: PGear;
 begin
 gtCase: begin
 Result^.Radius:= 16;
 Result^.Elasticity:= _0_3
 end;
 gtDEagleShot: begin
+Result^.Radius:= 1;
+Result^.Health:= 50
+end;
+gtSniperRifleShot: begin
 Result^.Radius:= 1;
 Result^.Health:= 50
 end;
 gtDynamite: begin
 Result^.Radius:= 3;
 cDamageModifier:= _1;
 if (GameFlags and gfLaserSight) = 0 then
 cLaserSighting:= false;
+if (GameFlags and gfArtillery) = 0 then
+cArtillery:= false;
 // have to sweep *all* current team hedgehogs since it is theoretically possible if you have enough invulnerabilities and switch turns to make your entire team invulnerable
+if (CurrentTeam <> nil) then
-if (GameFlags and gfInvulnerable) = 0 then
+with CurrentTeam^ do
-if (CurrentTeam <> nil) then
+for i:= 0 to cMaxHHIndex do
-with CurrentTeam^ do
+with Hedgehogs[i] do
-for i:= 0 to cMaxHHIndex do
+begin
-with Hedgehogs[i] do
+if (SpeechGear <> nil) then DeleteGear(SpeechGear);  // remove to restore persisting beyond end of turn. Tiy says was too much of a gameplay issue
 if (Gear <> nil) then
-Gear^.Invulnerable:= false;
+if (GameFlags and gfInvulnerable) = 0 then
+Gear^.Invulnerable:= false;
+end;
 end;
 procedure ApplyDamage(Gear: PGear; Damage: Longword);
 var s: shortstring;
 vampDmg: Longword;
 begin
 	t:= t^.NextGear
 	end
 end;
 procedure DrawHH(Gear: PGear);
-var t: LongInt;
+var i, t: LongInt;
 	amt: TAmmoType;
 	hx, hy, cx, cy, tx, ty, sx, sy, m: LongInt;  // hedgehog, crosshair, temp, sprite, direction
 	lx, ly, dx, dy, ax, ay, aAngle, dAngle: real;  // laser, change
 	defaultPos, HatVisible: boolean;
 VertexBuffer: array [0..1] of TVertex2f;
 						DrawRotated(sprShotgun, hx, hy, hwSign(Gear^.dX), aangle)
 					else
 						DrawRotated(sprHandShotgun, hx, hy, hwSign(Gear^.dX), aangle);
 				end;
 			gtDEagleShot: DrawRotated(sprDEagle, hx, hy, hwSign(Gear^.dX), aangle);
+			gtSniperRifleShot: begin
+					if (CurAmmoGear^.State and gstAnimation <> 0) then
+			            DrawRotatedF(sprSniperRifle, hx, hy, 1, hwSign(Gear^.dX), aangle)
+					else
+			            DrawRotatedF(sprSniperRifle, hx, hy, 0, hwSign(Gear^.dX), aangle)
+				end;
 			gtBallgun: DrawRotated(sprHandBallgun, hx, hy, hwSign(Gear^.dX), aangle);
 			gtRCPlane: begin
 				DrawRotated(sprHandPlane, hx, hy, hwSign(Gear^.dX), 0);
 				defaultPos:= false
 				end;
 			gtRope: begin
 				if Gear^.X < CurAmmoGear^.X then
 					begin
 					dAngle:= 0;
-					m:= 1
+					i:= 1
 					end else
 					begin
 					dAngle:= 180;
-					m:= -1
+					i:= -1
 					end;
 sx:= hwRound(Gear^.X) + WorldDx;
 sy:= hwRound(Gear^.Y) + WorldDy;
 				DrawHedgehog(sx, sy,
-						m,
+						i,
 						1,
 						0,
 						DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + dAngle);
 				defaultPos:= false
 				end;
 		end;
 		case CurAmmoGear^.Kind of
 			gtShotgunShot,
 			gtDEagleShot,
+			gtSniperRifleShot,
 			gtShover: begin
 				DrawHedgehog(sx, sy,
 						hwSign(Gear^.dX),
 						0,
 						4,
 			amBallgun: DrawRotated(sprHandBallgun, hx, hy, hwSign(Gear^.dX), aangle);
 			amDrill: DrawRotated(sprHandDrill, hx, hy, hwSign(Gear^.dX), aangle);
 			amRope: DrawRotated(sprHandRope, hx, hy, hwSign(Gear^.dX), aangle);
 			amShotgun: DrawRotated(sprHandShotgun, hx, hy, hwSign(Gear^.dX), aangle);
 			amDEagle: DrawRotated(sprHandDEagle, hx, hy, hwSign(Gear^.dX), aangle);
+			amSniperRifle: DrawRotatedF(sprSniperRifle, hx, hy, 0, hwSign(Gear^.dX), aangle);
 			amBlowTorch: DrawRotated(sprHandBlowTorch, hx, hy, hwSign(Gear^.dX), aangle);
 			amRCPlane: begin
 				DrawRotated(sprHandPlane, hx, hy, hwSign(Gear^.dX), 0);
 				defaultPos:= false
 				end;
 Gear^.Invulnerable:= true;  // this is only checked on hogs right now, so no need for gear type check
 Gear:= Gear^.NextGear
 end;
 if (GameFlags and gfLaserSight) <> 0 then
-cLaserSighting:= true
+cLaserSighting:= true;
+if (GameFlags and gfArtillery) <> 0 then
+cArtillery:= true
 end;
 procedure doMakeExplosion(X, Y, Radius: LongInt; Mask: LongWord);
 var Gear: PGear;
 dmg, dmgRadius: LongInt;

changeset 2023	41d3afaa20c7
parent 2020	f8cd566204ef
child 2025	692308790912