equal
deleted
inserted
replaced
946 else |
946 else |
947 Gear^.dX:= Gear^.dX * Gear^.Friction; |
947 Gear^.dX:= Gear^.dX * Gear^.Friction; |
948 end |
948 end |
949 end; |
949 end; |
950 |
950 |
951 if (Gear^.State <> 0) then |
951 if (Gear^.State and (gstMoving or gstHHJumping or gstHHHJump)) <> 0 then |
952 DeleteCI(Gear); |
952 DeleteCI(Gear); |
953 |
953 |
954 if isUnderwater then |
954 if isUnderwater then |
955 begin |
955 begin |
956 Gear^.dY:= Gear^.dY * _0_999; |
956 Gear^.dY:= Gear^.dY * _0_999; |
1344 |
1344 |
1345 //////////////////////////////////////////////////////////////////////////////// |
1345 //////////////////////////////////////////////////////////////////////////////// |
1346 procedure doStepHedgehog(Gear: PGear); |
1346 procedure doStepHedgehog(Gear: PGear); |
1347 var tX: hwFloat; |
1347 var tX: hwFloat; |
1348 begin |
1348 begin |
|
1349 AddFileLog('[HOG] -#' + inttostr(Gear^.uid) + ': ' + floattostr(Gear^.X) + ', ' + floattostr(Gear^.Y) + ' (' + floattostr(Gear^.dX) + ', ' + floattostr(Gear^.dY) + ')'); |
1349 CheckGearDrowning(Gear); |
1350 CheckGearDrowning(Gear); |
1350 if Gear = nil then exit; |
1351 if Gear = nil then exit; |
1351 tX:= Gear^.X; |
1352 tX:= Gear^.X; |
1352 if WorldWrap(Gear) then |
1353 if WorldWrap(Gear) then |
1353 begin |
1354 begin |
1387 if Team^.hasGone then |
1388 if Team^.hasGone then |
1388 TeamGoneEffect(Team^) |
1389 TeamGoneEffect(Team^) |
1389 else |
1390 else |
1390 doStepHedgehogDriven(Gear) |
1391 doStepHedgehogDriven(Gear) |
1391 end; |
1392 end; |
|
1393 AddFileLog('[HOG] +#' + inttostr(Gear^.uid) + ': ' + floattostr(Gear^.X) + ', ' + floattostr(Gear^.Y) + ' (' + floattostr(Gear^.dX) + ', ' + floattostr(Gear^.dY) + ')'); |
1392 end; |
1394 end; |
1393 |
1395 |
1394 end. |
1396 end. |