# HG changeset patch
# User nemo
# Date 1566220309 14400
# Node ID cf4a9632e649a3881d0bbfba4e1dfe1b5c11678b
# Parent  63372e3879df0e66092faae8a7c9cc01312e651b# Parent  06e5f9ec5f8de83a59a3939a34a14130dd0b32cf
merge

diff -r 06e5f9ec5f8d -r cf4a9632e649 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Fri Aug 16 15:03:14 2019 -0600
+++ b/hedgewars/uTeams.pas	Mon Aug 19 09:11:49 2019 -0400
@@ -453,7 +453,7 @@
     if ((GameFlags and gfSwitchHog) <> 0) and (not CurrentTeam^.hasGone) and
             // Exception: During the special "Place your King" round in King Mode;
             // you're not supposed to switch away from your king in this round.
-            (not (((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) and (TotalRoundsReal <= 0))) then
+            (not (((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) and (TotalRoundsReal = -1))) then
         begin
         g:= AddGear(hwRound(CurrentHedgehog^.Gear^.X), hwRound(CurrentHedgehog^.Gear^.Y), gtSwitcher, 0, _0, _0, 0);
         CurAmmoGear:= g;