equal
deleted
inserted
replaced
156 |
156 |
157 function AddGear(X, Y: LongInt; Kind: TGearType; State: Longword; dX, dY: hwFloat; Timer: LongWord): PGear; |
157 function AddGear(X, Y: LongInt; Kind: TGearType; State: Longword; dX, dY: hwFloat; Timer: LongWord): PGear; |
158 var gear: PGear; |
158 var gear: PGear; |
159 begin |
159 begin |
160 inc(GCounter); |
160 inc(GCounter); |
|
161 |
161 AddFileLog('AddGear: #' + inttostr(GCounter) + ' (' + inttostr(x) + ',' + inttostr(y) + '), d(' + floattostr(dX) + ',' + floattostr(dY) + ') type = ' + EnumToStr(Kind)); |
162 AddFileLog('AddGear: #' + inttostr(GCounter) + ' (' + inttostr(x) + ',' + inttostr(y) + '), d(' + floattostr(dX) + ',' + floattostr(dY) + ') type = ' + EnumToStr(Kind)); |
|
163 |
162 |
164 |
163 New(gear); |
165 New(gear); |
164 FillChar(gear^, sizeof(TGear), 0); |
166 FillChar(gear^, sizeof(TGear), 0); |
165 gear^.X:= int2hwFloat(X); |
167 gear^.X:= int2hwFloat(X); |
166 gear^.Y:= int2hwFloat(Y); |
168 gear^.Y:= int2hwFloat(Y); |
626 Gear^.Hedgehog^.Team^.Clan^.Flawless:= false; |
628 Gear^.Hedgehog^.Team^.Clan^.Flawless:= false; |
627 if (hwRound(Gear^.Y) >= cWaterLine) then |
629 if (hwRound(Gear^.Y) >= cWaterLine) then |
628 begin |
630 begin |
629 t:= max(Gear^.Damage, Gear^.Health); |
631 t:= max(Gear^.Damage, Gear^.Health); |
630 Gear^.Damage:= t; |
632 Gear^.Damage:= t; |
631 if ((not SuddenDeathDmg and (WaterOpacity < $FF)) or (SuddenDeathDmg and (WaterOpacity < $FF))) |
633 if (((not SuddenDeathDmg) and (WaterOpacity < $FF)) or (SuddenDeathDmg and (WaterOpacity < $FF))) |
632 and (hwRound(Gear^.Y) < cWaterLine + 256) then |
634 and (hwRound(Gear^.Y) < cWaterLine + 256) then |
633 spawnHealthTagForHH(Gear, t); |
635 spawnHealthTagForHH(Gear, t); |
634 end; |
636 end; |
635 |
637 |
636 team:= Gear^.Hedgehog^.Team; |
638 team:= Gear^.Hedgehog^.Team; |