equal
deleted
inserted
replaced
621 TargetPoint.X:= putX; |
621 TargetPoint.X:= putX; |
622 TargetPoint.Y:= putY |
622 TargetPoint.Y:= putY |
623 end; |
623 end; |
624 {$IFDEF DEBUGFILE}AddFilelog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y));{$ENDIF} |
624 {$IFDEF DEBUGFILE}AddFilelog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y));{$ENDIF} |
625 State:= State and not gstHHChooseTarget; |
625 State:= State and not gstHHChooseTarget; |
626 if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_AttackingPut) <> 0 then |
626 if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackingPut) <> 0 then |
627 Message:= Message or gm_Attack; |
627 Message:= Message or gm_Attack; |
628 end |
628 end |
629 else |
629 else |
630 if CurrentTeam^.ExtDriven then |
630 if CurrentTeam^.ExtDriven then |
631 OutError('got /put while not being in choose target mode', false) |
631 OutError('got /put while not being in choose target mode', false) |
691 begin |
691 begin |
692 bSelected:= false; |
692 bSelected:= false; |
693 |
693 |
694 if bShowAmmoMenu then bShowAmmoMenu:= false |
694 if bShowAmmoMenu then bShowAmmoMenu:= false |
695 else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or |
695 else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or |
696 ((MultiShootAttacks > 0) and ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NoRoundEndHint) = 0)) or |
696 ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or |
697 ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true |
697 ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true |
698 end; |
698 end; |
699 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1 |
699 if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1 |
700 end |
700 end |
701 end; |
701 end; |