--- a/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua	Fri May 04 14:38:01 2018 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua	Fri May 04 14:46:39 2018 +0200
@@ -1286,10 +1286,8 @@
 
 				if(CS.TEMP_VALUE>1)
 				then
-					AddAmmo(CurrentHedgehog,amSwitch,GetAmmoCount(CurrentHedgehog, amSwitch)+1)
-
-					SetWeapon(amSwitch)
-					CS.TEMP_VALUE=87
+					-- Enable switch hog on turn start (North America)
+					EnableSwitchHog()
 				end
 			end
 
@@ -1824,13 +1822,6 @@
 		SetGravity(100)
 	end
 
-	--enable switch (north america)
-	if(GetCurAmmoType() == amSwitch and CS.TEMP_VALUE==87)
-	then
-		SetGearMessage(CurrentHedgehog,gmAttack)
-		CS.TEMP_VALUE=0
-	end
-
 	if(CS.SPEECH_TIMER > 0) then
 		CS.SPEECH_TIMER = CS.SPEECH_TIMER - 20
 	end