equal
deleted
inserted
replaced
455 |
455 |
456 with CurrentHedgehog^.Gear^, |
456 with CurrentHedgehog^.Gear^, |
457 CurrentHedgehog^ do |
457 CurrentHedgehog^ do |
458 if (State and gstChooseTarget) <> 0 then |
458 if (State and gstChooseTarget) <> 0 then |
459 begin |
459 begin |
460 isCursorVisible:= false; |
460 if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoTargetAfter) <> 0 then |
|
461 isCursorVisible:= false; |
461 if not CurrentTeam^.ExtDriven then |
462 if not CurrentTeam^.ExtDriven then |
462 begin |
463 begin |
463 if fromAI then |
464 if fromAI then |
464 begin |
465 begin |
465 TargetPoint.X:= putX; |
466 TargetPoint.X:= putX; |
468 else |
469 else |
469 begin |
470 begin |
470 TargetPoint.X:= CursorPoint.X - WorldDx; |
471 TargetPoint.X:= CursorPoint.X - WorldDx; |
471 TargetPoint.Y:= cScreenHeight - CursorPoint.Y - WorldDy; |
472 TargetPoint.Y:= cScreenHeight - CursorPoint.Y - WorldDy; |
472 end; |
473 end; |
|
474 if (WorldEdge <> weBounce) then |
|
475 TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
473 SendIPCXY('p', TargetPoint.X, TargetPoint.Y); |
476 SendIPCXY('p', TargetPoint.X, TargetPoint.Y); |
474 end |
477 end |
475 else |
478 else |
476 begin |
479 begin |
|
480 TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
477 TargetPoint.X:= putX; |
481 TargetPoint.X:= putX; |
478 TargetPoint.Y:= putY |
482 TargetPoint.Y:= putY |
479 end; |
483 end; |
480 AddFileLog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y)); |
484 AddFileLog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y)); |
481 State:= State and (not gstChooseTarget); |
485 State:= State and (not gstChooseTarget); |