equal
deleted
inserted
replaced
154 Gear^.doStep := @doStepDrowningGear; |
154 Gear^.doStep := @doStepDrowningGear; |
155 Gear^.State := Gear^.State and (not gstHHDriven); |
155 Gear^.State := Gear^.State and (not gstHHDriven); |
156 AddCaption(Format(GetEventString(eidDrowned), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage); |
156 AddCaption(Format(GetEventString(eidDrowned), Gear^.Hedgehog^.Name), cWhiteColor, capgrpMessage); |
157 end |
157 end |
158 end |
158 end |
159 else Gear^.doStep := @doStepDrowningGear |
159 else Gear^.doStep := @doStepDrowningGear; |
|
160 if Gear^.Kind = gtFlake then exit // skip splashes |
160 end; |
161 end; |
161 if ((not isSubmersible) and (Y < cWaterLine + 64 + Gear^.Radius)) or |
162 if ((not isSubmersible) and (Y < cWaterLine + 64 + Gear^.Radius)) or |
162 (isSubmersible and (Y < cWaterLine + 2 + Gear^.Radius) and ((CurAmmoGear^.Pos = 0) and (CurAmmoGear^.dY < _0_01))) then |
163 (isSubmersible and (Y < cWaterLine + 2 + Gear^.Radius) and ((CurAmmoGear^.Pos = 0) and (CurAmmoGear^.dY < _0_01))) then |
163 // don't play splash if they are already way past the surface |
164 // don't play splash if they are already way past the surface |
164 PlaySound(sndSplash) |
165 PlaySound(sndSplash) |