hedgewars/uAmmos.pas
changeset 5031 e26f430be1ed
parent 4976 088d40d8aba2
child 5136 948da1e50205
equal deleted inserted replaced
5028:3c43f00b0743 5031:e26f430be1ed
   293             inc(slot)
   293             inc(slot)
   294             end
   294             end
   295         end;
   295         end;
   296     TryDo(slot <= cMaxSlotIndex, 'Ammo slot index overflow', true);
   296     TryDo(slot <= cMaxSlotIndex, 'Ammo slot index overflow', true);
   297     CurAmmoType:= Ammo^[slot, ammoidx].AmmoType;
   297     CurAmmoType:= Ammo^[slot, ammoidx].AmmoType;
       
   298     if (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then
       
   299         ShowCrosshair:= (Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0
       
   300     else
       
   301         ShowCrosshair:= (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoCrosshair) = 0;
   298     end
   302     end
   299 end;
   303 end;
   300 
   304 
   301 procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
   305 procedure ApplyAmmoChanges(var Hedgehog: THedgehog);
   302 var s: shortstring;
   306 var s: shortstring;
   331             isCursorVisible:= true
   335             isCursorVisible:= true
   332             end else begin
   336             end else begin
   333             Gear^.State:= Gear^.State and not gstHHChooseTarget;
   337             Gear^.State:= Gear^.State and not gstHHChooseTarget;
   334             isCursorVisible:= false
   338             isCursorVisible:= false
   335             end;
   339             end;
   336         if (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_AltAttack) <> 0) then
       
   337             ShowCrosshair:= (Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoCrossHair) = 0
       
   338         else
       
   339             ShowCrosshair:= (Propz and ammoprop_NoCrosshair) = 0;
       
   340         end
   340         end
   341     end;
   341     end;
   342 end;
   342 end;
   343 
   343 
   344 procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);
   344 procedure SwitchNotHeldAmmo(var Hedgehog: THedgehog);