equal
deleted
inserted
replaced
525 else |
525 else |
526 begin |
526 begin |
527 TargetPoint.X:= CursorPoint.X - WorldDx; |
527 TargetPoint.X:= CursorPoint.X - WorldDx; |
528 TargetPoint.Y:= cScreenHeight - CursorPoint.Y - WorldDy; |
528 TargetPoint.Y:= cScreenHeight - CursorPoint.Y - WorldDy; |
529 end; |
529 end; |
530 if (WorldEdge <> weBounce) then |
530 if (WorldEdge <> weBounce) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoWrapTarget) = 0) then |
531 TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
531 TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
532 SendIPCXY('p', TargetPoint.X, TargetPoint.Y); |
532 SendIPCXY('p', TargetPoint.X, TargetPoint.Y); |
533 end |
533 end |
534 else |
534 else |
535 begin |
535 begin |
536 TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
536 if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoWrapTarget) = 0 then |
|
537 TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
537 TargetPoint.X:= putX; |
538 TargetPoint.X:= putX; |
538 TargetPoint.Y:= putY |
539 TargetPoint.Y:= putY |
539 end; |
540 end; |
540 AddFileLog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y)); |
541 AddFileLog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y)); |
541 State:= State and (not gstChooseTarget); |
542 State:= State and (not gstChooseTarget); |