--- a/hedgewars/uGearsHandlersMess.pas	Wed Sep 05 20:09:32 2018 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Thu Oct 04 21:17:21 2018 +0200
@@ -3268,7 +3268,7 @@
     with HHGear^ do
         begin
         State := State and (not gstAttacking);
-        Message := Message and (not gmAttack)
+        Message := Message and (not (gmAttack or gmSwitch))
         end
 end;
 
@@ -5478,7 +5478,7 @@
         Gear^.dY.isNegative := not Gear^.dY.isNegative;
         HHGear^.dX := Gear^.dX;
         HHGear^.dY := Gear^.dY;
-        AmmoShove(Gear, 0, 80);
+        AmmoShove(Gear, 0, 79);
         Gear^.dX.isNegative := not Gear^.dX.isNegative;
         Gear^.dY.isNegative := not Gear^.dY.isNegative;
         end;