equal
deleted
inserted
replaced
413 |
413 |
414 if ((Gear^.State and gstMoving) <> 0) |
414 if ((Gear^.State and gstMoving) <> 0) |
415 or (StepTicks = cHHStepTicks) |
415 or (StepTicks = cHHStepTicks) |
416 or (CurAmmoGear <> nil) then // we're moving |
416 or (CurAmmoGear <> nil) then // we're moving |
417 begin |
417 begin |
|
418 with PHedgehog(Gear^.Hedgehog)^ do |
|
419 if (CurAmmoGear = nil) |
|
420 and (Gear^.dY > _0_39) |
|
421 and (Ammo^[CurSlot, CurAmmo].AmmoType = amParachute) then Gear^.Message:= Gear^.Message or gm_Attack; |
418 // check for case with ammo |
422 // check for case with ammo |
419 t:= CheckGearNear(Gear, gtCase, 36, 36); |
423 t:= CheckGearNear(Gear, gtCase, 36, 36); |
420 if t <> nil then |
424 if t <> nil then |
421 PickUp(Gear, t) |
425 PickUp(Gear, t) |
422 end else |
426 end; |
423 if ((Gear^.State and gstMoving) <> 0) then |
|
424 with PHedgehog(Gear^.Hedgehog)^ do |
|
425 if (CurAmmoGear = nil) |
|
426 and (Gear^.dY > _0_39) |
|
427 and (Ammo^[CurSlot, CurAmmo].AmmoType = amParachute) then Gear^.Message:= Gear^.Message or gm_Attack; |
|
428 |
427 |
429 if CurAmmoGear <> nil then |
428 if CurAmmoGear <> nil then |
430 begin |
429 begin |
431 CurAmmoGear^.Message:= Gear^.Message; |
430 CurAmmoGear^.Message:= Gear^.Message; |
432 exit |
431 exit |