equal
deleted
inserted
replaced
447 ((WorldEdge = weBounce) and ((hwRound(Gear^.X) <= LeftX) or (hwRound(Gear^.X) >= RightX))) then |
447 ((WorldEdge = weBounce) and ((hwRound(Gear^.X) <= LeftX) or (hwRound(Gear^.X) >= RightX))) then |
448 begin |
448 begin |
449 HHGear^.State := HHGear^.State and (not (gstAttacking or gstHHJumping or gstHHHJump)); |
449 HHGear^.State := HHGear^.State and (not (gstAttacking or gstHHJumping or gstHHHJump)); |
450 HHGear^.Message := HHGear^.Message and (not gmAttack); |
450 HHGear^.Message := HHGear^.Message and (not gmAttack); |
451 DeleteGear(Gear); |
451 DeleteGear(Gear); |
|
452 if (GetAmmoEntry(HHGear^.Hedgehog^, amRope)^.Count >= 1) and (HHGear^.Hedgehog^.CurAmmoType <> amRope) then |
|
453 SetWeapon(amRope); |
452 exit() |
454 exit() |
453 end; |
455 end; |
454 |
456 |
455 DeleteCI(HHGear); |
457 DeleteCI(HHGear); |
456 |
458 |
539 begin |
541 begin |
540 State := State and (not gstAttacking); |
542 State := State and (not gstAttacking); |
541 Message := Message and (not gmAttack) |
543 Message := Message and (not gmAttack) |
542 end; |
544 end; |
543 DeleteGear(Gear); |
545 DeleteGear(Gear); |
|
546 if GetAmmoEntry(HHGear^.Hedgehog^, TAmmoType(amRope))^.Count >= 1 then |
|
547 SetWeapon(amRope); |
544 exit; |
548 exit; |
545 end; |
549 end; |
546 if CheckGearDrowning(HHGear) then DeleteGear(Gear) |
550 if CheckGearDrowning(HHGear) then DeleteGear(Gear) |
547 end; |
551 end; |
548 |
552 |