equal
deleted
inserted
replaced
478 if not isInMultiShoot then |
478 if not isInMultiShoot then |
479 AllInactive:= false |
479 AllInactive:= false |
480 else |
480 else |
481 Gear^.Message:= 0; |
481 Gear^.Message:= 0; |
482 |
482 |
|
483 if (TurnTimeLeft = 0) or (Gear^.Damage > 0) then |
|
484 begin |
|
485 TurnTimeLeft:= 0; |
|
486 Gear^.State:= Gear^.State and not (gstHHDriven or gstAnimation); |
|
487 if Gear^.Damage > 0 then |
|
488 Gear^.State:= Gear^.State and not (gstHHJumping or gstHHHJump); |
|
489 exit |
|
490 end; |
|
491 |
483 if (Gear^.State and gstAnimation) <> 0 then |
492 if (Gear^.State and gstAnimation) <> 0 then |
484 begin |
493 begin |
485 Gear^.Message:= 0; |
494 Gear^.Message:= 0; |
486 inc(Gear^.Timer); |
495 inc(Gear^.Timer); |
487 if Gear^.Timer = 125 then |
496 if Gear^.Timer = 125 then |
491 if Gear^.Pos = Wavez[TWave(Gear^.Tag)].FramesCount then |
500 if Gear^.Pos = Wavez[TWave(Gear^.Tag)].FramesCount then |
492 Gear^.State:= Gear^.State and not gstAnimation |
501 Gear^.State:= Gear^.State and not gstAnimation |
493 end; |
502 end; |
494 exit |
503 exit |
495 end; |
504 end; |
496 |
|
497 |
|
498 if (TurnTimeLeft = 0) or (Gear^.Damage > 0) then |
|
499 begin |
|
500 TurnTimeLeft:= 0; |
|
501 Gear^.State:= Gear^.State and not gstHHDriven; |
|
502 if Gear^.Damage > 0 then |
|
503 Gear^.State:= Gear^.State and not (gstHHJumping or gstHHHJump); |
|
504 exit |
|
505 end; |
|
506 |
505 |
507 if ((Gear^.State and gstMoving) <> 0) |
506 if ((Gear^.State and gstMoving) <> 0) |
508 or (StepTicks = cHHStepTicks) |
507 or (StepTicks = cHHStepTicks) |
509 or (CurAmmoGear <> nil) then // we're moving |
508 or (CurAmmoGear <> nil) then // we're moving |
510 begin |
509 begin |