equal
deleted
inserted
replaced
157 if Ammo^[Slot, Pos].Count > 0 then |
157 if Ammo^[Slot, Pos].Count > 0 then |
158 begin |
158 begin |
159 DrawTexture(cScreenWidth div 2 - 200 + AMxShift, cScreenHeight - 68, Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex); |
159 DrawTexture(cScreenWidth div 2 - 200 + AMxShift, cScreenHeight - 68, Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex); |
160 |
160 |
161 if Ammo^[Slot, Pos].Count < AMMO_INFINITE then |
161 if Ammo^[Slot, Pos].Count < AMMO_INFINITE then |
162 DrawTexture(cScreenWidth + AMxShift - 35, cScreenHeight - 68, CountTexz[Ammo^[Slot, Pos].Count]); |
162 DrawTexture(cScreenWidth div 2 + AMxShift - 35, cScreenHeight - 68, CountTexz[Ammo^[Slot, Pos].Count]); |
163 |
163 |
164 if bSelected and (Ammoz[Ammo^[Slot, Pos].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber < 0) then |
164 if bSelected and (Ammoz[Ammo^[Slot, Pos].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber < 0) then |
165 begin |
165 begin |
166 bShowAmmoMenu:= false; |
166 bShowAmmoMenu:= false; |
167 SetWeapon(Ammo^[Slot, Pos].AmmoType); |
167 SetWeapon(Ammo^[Slot, Pos].AmmoType); |
489 FollowGear:= nil; |
489 FollowGear:= nil; |
490 prevPoint:= CursorPoint; |
490 prevPoint:= CursorPoint; |
491 exit |
491 exit |
492 end |
492 end |
493 else begin |
493 else begin |
494 CursorPoint.x:= (hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * 100 + WorldDx); |
494 CursorPoint.x:= (prevPoint.x * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * 100 + WorldDx) div 8; |
495 //addcaption(inttostr(CursorPoint.X), $AFAFAF, capgrpGameState); |
495 //addcaption(inttostr(CursorPoint.X), $AFAFAF, capgrpGameState); |
496 CursorPoint.y:= (prevPoint.y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8; |
496 CursorPoint.y:= (prevPoint.y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8; |
497 end; |
497 end; |
498 |
498 |
499 if ((CursorPoint.X = prevPoint.X) and (CursorPoint.Y = prevpoint.Y)) then exit; |
499 if ((CursorPoint.X = prevPoint.X) and (CursorPoint.Y = prevpoint.Y)) then exit; |
528 CursorPoint.X:= - cScreenWidth div 2 + EdgesDist |
528 CursorPoint.X:= - cScreenWidth div 2 + EdgesDist |
529 end else |
529 end else |
530 if CursorPoint.X > cScreenWidth div 2 - EdgesDist then |
530 if CursorPoint.X > cScreenWidth div 2 - EdgesDist then |
531 begin |
531 begin |
532 WorldDx:= WorldDx - CursorPoint.X + cScreenWidth div 2 - EdgesDist; |
532 WorldDx:= WorldDx - CursorPoint.X + cScreenWidth div 2 - EdgesDist; |
533 CursorPoint.X:= cScreenWidth + cScreenWidth div 2 - EdgesDist |
533 CursorPoint.X:= cScreenWidth div 2 - EdgesDist |
534 end; |
534 end; |
535 if CursorPoint.Y < EdgesDist then |
535 if CursorPoint.Y < EdgesDist then |
536 begin |
536 begin |
537 WorldDy:= WorldDy + CursorPoint.Y - EdgesDist; |
537 WorldDy:= WorldDy + CursorPoint.Y - EdgesDist; |
538 CursorPoint.Y:= EdgesDist |
538 CursorPoint.Y:= EdgesDist |