equal
deleted
inserted
replaced
185 |
185 |
186 if CurrentHedgehog <> nil then |
186 if CurrentHedgehog <> nil then |
187 begin |
187 begin |
188 gear^.Hedgehog:= CurrentHedgehog; |
188 gear^.Hedgehog:= CurrentHedgehog; |
189 if (CurrentHedgehog^.Gear <> nil) and (hwRound(CurrentHedgehog^.Gear^.X) = X) and (hwRound(CurrentHedgehog^.Gear^.Y) = Y) then |
189 if (CurrentHedgehog^.Gear <> nil) and (hwRound(CurrentHedgehog^.Gear^.X) = X) and (hwRound(CurrentHedgehog^.Gear^.Y) = Y) then |
190 gear^.CollisionMask:= $FF7F |
190 gear^.CollisionMask:= lfNotCurrentMask |
191 end; |
191 end; |
192 |
192 |
193 if (Ammoz[Gear^.AmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0) then |
193 if (Ammoz[Gear^.AmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0) then |
194 gear^.Z:= cHHZ+1 |
194 gear^.Z:= cHHZ+1 |
195 else gear^.Z:= cUsualZ; |
195 else gear^.Z:= cUsualZ; |
327 gear^.Density:= _1_6; |
327 gear^.Density:= _1_6; |
328 gear^.Timer:= 500; |
328 gear^.Timer:= 500; |
329 end; |
329 end; |
330 gtKnife: begin |
330 gtKnife: begin |
331 gear^.Density:= _4; |
331 gear^.Density:= _4; |
332 gear^.Radius:= 16 |
332 gear^.Radius:= 7 |
333 end; |
333 end; |
334 gtCase: begin |
334 gtCase: begin |
335 gear^.ImpactSound:= sndGraveImpact; |
335 gear^.ImpactSound:= sndGraveImpact; |
336 gear^.nImpactSounds:= 1; |
336 gear^.nImpactSounds:= 1; |
337 gear^.Radius:= 16; |
337 gear^.Radius:= 16; |
548 gear^.Timer:= 0; |
548 gear^.Timer:= 0; |
549 gear^.Tag:= TotalRounds + 3; |
549 gear^.Tag:= TotalRounds + 3; |
550 gear^.Pos:= 1; |
550 gear^.Pos:= 1; |
551 end; |
551 end; |
552 } |
552 } |
553 gtIceGun: gear^.Health:= 1000; |
553 gtIceGun: begin |
|
554 gear^.Health:= 1000; |
|
555 gear^.Radius:= 8; |
|
556 end; |
554 gtGenericFaller:begin |
557 gtGenericFaller:begin |
555 gear^.AdvBounce:= 1; |
558 gear^.AdvBounce:= 1; |
556 gear^.Radius:= 1; |
559 gear^.Radius:= 1; |
557 gear^.Elasticity:= _0_9; |
560 gear^.Elasticity:= _0_9; |
558 gear^.Friction:= _0_995; |
561 gear^.Friction:= _0_995; |