equal
deleted
inserted
replaced
1294 if not isInMultiShoot then |
1294 if not isInMultiShoot then |
1295 AllInactive:= false |
1295 AllInactive:= false |
1296 else if Hedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle] then |
1296 else if Hedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle] then |
1297 HHGear^.Message:= HHGear^.Message and gmPrecise; |
1297 HHGear^.Message:= HHGear^.Message and gmPrecise; |
1298 |
1298 |
1299 if (((GameFlags and gfInfAttack) <> 0) or ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Utility) <> 0)) and isInMultiShoot then |
1299 if ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Utility) <> 0) and isInMultiShoot then |
1300 AllInactive:= true |
1300 AllInactive:= true |
1301 else if not isInMultiShoot then |
1301 else if not isInMultiShoot then |
1302 AllInactive:= false; |
1302 AllInactive:= false; |
1303 |
1303 |
1304 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) or (((GameFlags and gfKing) <> 0) and (not Hedgehog^.Team^.hasKing)) or (LuaEndTurnRequested = true) then |
1304 if (TurnTimeLeft = 0) or (HHGear^.Damage > 0) or (((GameFlags and gfKing) <> 0) and (not Hedgehog^.Team^.hasKing)) or (LuaEndTurnRequested = true) then |
1432 GHStepTicks:= 95 |
1432 GHStepTicks:= 95 |
1433 end; |
1433 end; |
1434 exit |
1434 exit |
1435 end; |
1435 end; |
1436 |
1436 |
1437 if ((not (isInMultiShoot and (Hedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle]) and ((GameFlags and gfInfAttack) = 0)))) and (Hedgehog^.Gear <> nil) then |
1437 if not(isInMultiShoot and (Hedgehog^.CurAmmoType in [amShotgun, amDEagle, amSniperRifle])) and (Hedgehog^.Gear <> nil) then |
1438 begin |
1438 begin |
1439 if GHStepTicks > 0 then |
1439 if GHStepTicks > 0 then |
1440 dec(GHStepTicks); |
1440 dec(GHStepTicks); |
1441 if (GHStepTicks = 0) then |
1441 if (GHStepTicks = 0) then |
1442 HedgehogStep(HHGear) |
1442 HedgehogStep(HHGear) |