equal
deleted
inserted
replaced
962 |
962 |
963 if TestCollisionYwithGear(HHGear, 1) then |
963 if TestCollisionYwithGear(HHGear, 1) then |
964 begin |
964 begin |
965 CheckHHDamage(HHGear); |
965 CheckHHDamage(HHGear); |
966 HHGear^.dY:= _0; |
966 HHGear^.dY:= _0; |
967 HHGear^.State:= HHGear^.State and not (gstHHJumping or gstHHHJump); |
967 //HHGear^.State:= HHGear^.State and not (gstHHJumping or gstHHHJump); |
968 end else |
968 end else |
969 begin |
969 begin |
970 HHGear^.Y:= HHGear^.Y + HHGear^.dY; |
970 HHGear^.Y:= HHGear^.Y + HHGear^.dY; |
971 Gear^.Y:= Gear^.Y + HHGear^.dY; |
971 Gear^.Y:= Gear^.Y + HHGear^.dY; |
972 HHGear^.dY:= HHGear^.dY + cGravity; |
972 HHGear^.dY:= HHGear^.dY + cGravity; |
980 begin |
980 begin |
981 Gear^.X:= Gear^.X + tx; |
981 Gear^.X:= Gear^.X + tx; |
982 Gear^.Y:= Gear^.Y + ty; |
982 Gear^.Y:= Gear^.Y + ty; |
983 Gear^.Elasticity:= tt; |
983 Gear^.Elasticity:= tt; |
984 Gear^.doStep:= @doStepRopeWork; |
984 Gear^.doStep:= @doStepRopeWork; |
985 with HHGear^ do State:= State and not (gstAttacking or gstMoving or gstHHHJump); |
985 with HHGear^ do State:= State and not (gstAttacking or gstHHJumping or gstHHHJump); |
986 |
986 |
987 RemoveFromAmmo; |
987 RemoveFromAmmo; |
988 |
988 |
989 tt:= _0; |
989 tt:= _0; |
990 exit |
990 exit |
1002 if Gear^.Elasticity < _10 then |
1002 if Gear^.Elasticity < _10 then |
1003 Gear^.Elasticity:= _10000 |
1003 Gear^.Elasticity:= _10000 |
1004 else |
1004 else |
1005 begin |
1005 begin |
1006 Gear^.doStep:= @doStepRopeWork; |
1006 Gear^.doStep:= @doStepRopeWork; |
1007 with HHGear^ do State:= State and not (gstAttacking or gstHHHJump); |
1007 with HHGear^ do State:= State and not (gstAttacking or gstHHJumping or gstHHHJump); |
1008 |
1008 |
1009 RemoveFromAmmo; |
1009 RemoveFromAmmo; |
1010 |
1010 |
1011 exit |
1011 exit |
1012 end; |
1012 end; |