equal
deleted
inserted
replaced
369 while true do |
369 while true do |
370 begin |
370 begin |
371 x:= x + dX; |
371 x:= x + dX; |
372 y:= y + dY; |
372 y:= y + dY; |
373 dY:= dY + cGravityf; |
373 dY:= dY + cGravityf; |
374 (* |
374 |
375 if ((trunc(y) and LAND_HEIGHT_MASK) = 0) and ((trunc(x) and LAND_WIDTH_MASK) = 0) then |
375 { if ((trunc(y) and LAND_HEIGHT_MASK) = 0) and ((trunc(x) and LAND_WIDTH_MASK) = 0) then |
376 begin |
376 begin |
377 LandPixels[trunc(y), trunc(x)]:= v; |
377 LandPixels[trunc(y), trunc(x)]:= v; |
378 UpdateLandTexture(trunc(X), 1, trunc(Y), 1, true); |
378 UpdateLandTexture(trunc(X), 1, trunc(Y), 1, true); |
379 end; |
379 end;} |
380 *) |
380 |
381 |
381 |
382 // consider adding dX/dY calc here for fall damage |
382 // consider adding dX/dY calc here for fall damage |
383 if TestCollExcludingObjects(trunc(x), trunc(y), cHHRadius) then |
383 if TestCollExcludingObjects(trunc(x), trunc(y), cHHRadius) then |
384 begin |
384 begin |
385 if 0.4 < dY then |
385 if 0.4 < dY then |
622 exit(false) |
622 exit(false) |
623 end |
623 end |
624 end; |
624 end; |
625 |
625 |
626 repeat |
626 repeat |
|
627 {if ((hwRound(Gear^.Y) and LAND_HEIGHT_MASK) = 0) and ((hwRound(Gear^.X) and LAND_WIDTH_MASK) = 0) then |
|
628 begin |
|
629 LandPixels[hwRound(Gear^.Y), hwRound(Gear^.X)]:= Gear^.Hedgehog^.Team^.Clan^.Color; |
|
630 UpdateLandTexture(hwRound(Gear^.X), 1, hwRound(Gear^.Y), 1, true); |
|
631 end;} |
|
632 |
627 if not (hwRound(Gear^.Y) + cHHRadius < cWaterLine) then |
633 if not (hwRound(Gear^.Y) + cHHRadius < cWaterLine) then |
628 exit(false); |
634 exit(false); |
629 if (Gear^.State and gstMoving) <> 0 then |
635 if (Gear^.State and gstMoving) <> 0 then |
630 begin |
636 begin |
631 if (GoInfo.Ticks = 350) then |
637 if (GoInfo.Ticks = 350) then |
679 GoInfo.Ticks:= 0; |
685 GoInfo.Ticks:= 0; |
680 GoInfo.FallPix:= 0; |
686 GoInfo.FallPix:= 0; |
681 GoInfo.JumpType:= jmpNone; |
687 GoInfo.JumpType:= jmpNone; |
682 tY:= hwRound(Gear^.Y); |
688 tY:= hwRound(Gear^.Y); |
683 repeat |
689 repeat |
|
690 {if ((hwRound(Gear^.Y) and LAND_HEIGHT_MASK) = 0) and ((hwRound(Gear^.X) and LAND_WIDTH_MASK) = 0) then |
|
691 begin |
|
692 LandPixels[hwRound(Gear^.Y), hwRound(Gear^.X)]:= random($FFFFFFFF);//Gear^.Hedgehog^.Team^.Clan^.Color; |
|
693 UpdateLandTexture(hwRound(Gear^.X), 1, hwRound(Gear^.Y), 1, true); |
|
694 end;} |
|
695 |
684 pX:= hwRound(Gear^.X); |
696 pX:= hwRound(Gear^.X); |
685 pY:= hwRound(Gear^.Y); |
697 pY:= hwRound(Gear^.Y); |
686 if pY + cHHRadius >= cWaterLine then |
698 if pY + cHHRadius >= cWaterLine then |
687 begin |
699 begin |
688 if AltGear^.Hedgehog^.BotLevel < 4 then |
700 if AltGear^.Hedgehog^.BotLevel < 4 then |