hedgewars/uGearsHedgehog.pas
changeset 15127 f3f09c71ff6c
parent 15065 39067b45d0fc
child 15146 6b7d92fa4912
equal deleted inserted replaced
15126:ab21cbb0e3a0 15127:f3f09c71ff6c
  1299 if ((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 (HHGear^.Health = 0) or (((GameFlags and gfKing) <> 0) and (not Hedgehog^.Team^.hasKing)) or (LuaEndTurnRequested = true) then
  1305     begin
  1305     begin
  1306     if (Hedgehog^.CurAmmoType = amKnife) then
  1306     if (Hedgehog^.CurAmmoType = amKnife) then
  1307        LoadHedgehogHat(Hedgehog^, Hedgehog^.Hat);
  1307        LoadHedgehogHat(Hedgehog^, Hedgehog^.Hat);
  1308     if TagTurnTimeLeft = 0 then
  1308     if TagTurnTimeLeft = 0 then
  1309         TagTurnTimeLeft:= TurnTimeLeft;
  1309         TagTurnTimeLeft:= TurnTimeLeft;
  1310     TurnTimeLeft:= 0;
  1310     TurnTimeLeft:= 0;
  1311     if (GameOver = false) and ((GameFlags and gfInfAttack) = 0) and ((HHGear^.State and gstAttacked) = 0) and (HHGear^.Damage = 0) and (LuaNoEndTurnTaunts = false) and (uStats.getIsTurnSkipped() = false) then
  1311     if (GameOver = false) and ((GameFlags and gfInfAttack) = 0) and ((HHGear^.State and gstAttacked) = 0) and (HHGear^.Damage = 0) and (HHGear^.Health > 0) and (LuaNoEndTurnTaunts = false) and (uStats.getIsTurnSkipped() = false) then
  1312         begin
  1312         begin
  1313         AddVoice(sndBoring, Hedgehog^.Team^.voicepack);
  1313         AddVoice(sndBoring, Hedgehog^.Team^.voicepack);
  1314         if (GameFlags and gfInfAttack = 0) then
  1314         if (GameFlags and gfInfAttack = 0) then
  1315             begin
  1315             begin
  1316             s:= Hedgehog^.Name;
  1316             s:= Hedgehog^.Name;
  1321     HHGear^.State:= HHGear^.State and (not (gstHHDriven or gstAnimation or gstAttacking));
  1321     HHGear^.State:= HHGear^.State and (not (gstHHDriven or gstAnimation or gstAttacking));
  1322     AttackBar:= 0;
  1322     AttackBar:= 0;
  1323     StopSound(sndThrowPowerUp);
  1323     StopSound(sndThrowPowerUp);
  1324     LuaEndTurnRequested:= false;
  1324     LuaEndTurnRequested:= false;
  1325     LuaNoEndTurnTaunts:= false;
  1325     LuaNoEndTurnTaunts:= false;
  1326     if HHGear^.Damage > 0 then
  1326     if (HHGear^.Damage > 0) or (HHGear^.Health = 0) then
  1327         HHGear^.State:= HHGear^.State and (not (gstHHJumping or gstHHHJump));
  1327         HHGear^.State:= HHGear^.State and (not (gstHHJumping or gstHHHJump));
  1328     exit
  1328     exit
  1329     end;
  1329     end;
  1330 
  1330 
  1331 if isAFK and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
  1331 if isAFK and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then