hedgewars/uGears.pas
changeset 845 ca72cf446ec2
parent 841 0700e3d3474d
child 847 66970c0ed3aa
equal deleted inserted replaced
844:9a82149409f3 845:ca72cf446ec2
   488 					1,
   488 					1,
   489 					0,
   489 					0,
   490 					DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) - 110);
   490 					DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) - 110);
   491 			defaultPos:= false
   491 			defaultPos:= false
   492 			end
   492 			end
       
   493 		else if (CurAmmoGear^.Kind = gtPickHammer) then
       
   494 			defaultPos:= false
   493 	end else
   495 	end else
   494 	if ((Gear^.State and gstHHJumping) <> 0) then
   496 	if ((Gear^.State and gstHHJumping) <> 0) then
   495 		begin
   497 		begin
   496 		DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
   498 		DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
   497 			hwSign(Gear^.dX),
   499 			hwSign(Gear^.dX),
   563 
   565 
   564 		defaultPos:= false
   566 		defaultPos:= false
   565 	end
   567 	end
   566 end;
   568 end;
   567 
   569 
   568 if defaultPos then 
   570 if defaultPos then
   569 	DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
   571 	DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
   570 		hwSign(Gear^.dX),
   572 		hwSign(Gear^.dX),
   571 		0,
   573 		0,
   572 		3,
   574 		3,
   573 		0);
   575 		0);
   690     gtAmmo_Grenade: DrawRotated(sprGrenade, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
   692     gtAmmo_Grenade: DrawRotated(sprGrenade, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
   691        gtHealthTag,
   693        gtHealthTag,
   692      gtSmallDamage: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
   694      gtSmallDamage: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
   693            gtGrave: DrawSurfSprite(hwRound(Gear^.X) + WorldDx - 16, hwRound(Gear^.Y) + WorldDy - 16, 32, (GameTicks shr 7) and 7, PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex);
   695            gtGrave: DrawSurfSprite(hwRound(Gear^.X) + WorldDx - 16, hwRound(Gear^.Y) + WorldDy - 16, 32, (GameTicks shr 7) and 7, PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex);
   694              gtUFO: DrawSprite(sprUFO, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, (GameTicks shr 7) mod 4);
   696              gtUFO: DrawSprite(sprUFO, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, (GameTicks shr 7) mod 4);
       
   697       gtPickHammer: DrawSprite(sprPHammer, hwRound(Gear^.X) - 16 +  WorldDx, hwRound(Gear^.Y) - 50 + ((GameTicks shr 5) and 1) * 2 + WorldDy, 0);
   695             gtRope: begin
   698             gtRope: begin
   696                     roplen:= 0;
   699                     roplen:= 0;
   697                     if RopePoints.Count > 0 then
   700                     if RopePoints.Count > 0 then
   698                        begin
   701                        begin
   699                        i:= 0;
   702                        i:= 0;