--- a/hedgewars/uGears.pas	Sat Apr 14 23:36:57 2012 +0400
+++ b/hedgewars/uGears.pas	Sat Apr 14 23:50:14 2012 +0400
@@ -1237,22 +1237,23 @@
 
 procedure initModule;
 const handlers: array[TGearType] of TGearStepProcedure = (
+            @doStepFlame,
+            @doStepHedgehog,
+            @doStepMine,
+            @doStepCase,
+            @doStepCase,
             @doStepBomb,
-            @doStepHedgehog,
             @doStepShell,
             @doStepGrave,
             @doStepBee,
             @doStepShotgunShot,
             @doStepPickHammer,
             @doStepRope,
-            @doStepMine,
-            @doStepCase,
             @doStepDEagleShot,
             @doStepDynamite,
             @doStepBomb,
             @doStepCluster,
             @doStepShover,
-            @doStepFlame,
             @doStepFirePunch,
             @doStepActionTimer,
             @doStepActionTimer,
@@ -1280,7 +1281,6 @@
             @doStepSniperRifleShot,
             @doStepJetpack,
             @doStepMolotov,
-            @doStepCase,
             @doStepBirdy,
             @doStepEggWork,
             @doStepPortalShot,

--- a/hedgewars/uVariables.pas	Sat Apr 14 23:36:57 2012 +0400
+++ b/hedgewars/uVariables.pas	Sat Apr 14 23:50:14 2012 +0400
@@ -2233,22 +2233,23 @@
         );
 
     GearKindAmmoTypeMap : array [TGearType] of TAmmoType = (    
-(*        gtGrenade *)   amGrenade
+(*          gtFlame *)   amNothing
 (*       gtHedgehog *) , amNothing
+(*           gtMine *) , amNothing
+(*           gtCase *) , amNothing
+(*     gtExplosives *) , amNothing
+(*        gtGrenade *) , amGrenade
 (*          gtShell *) , amBazooka
 (*          gtGrave *) , amNothing
 (*            gtBee *) , amBee
 (*    gtShotgunShot *) , amShotgun
 (*     gtPickHammer *) , amPickHammer
 (*           gtRope *) , amRope
-(*           gtMine *) , amNothing
-(*           gtCase *) , amNothing
 (*     gtDEagleShot *) , amDEagle
 (*       gtDynamite *) , amDynamite
 (*    gtClusterBomb *) , amClusterBomb
 (*        gtCluster *) , amClusterBomb
 (*         gtShover *) , amBaseballBat  // Shover is only used for baseball bat right now
-(*          gtFlame *) , amNothing
 (*      gtFirePunch *) , amFirePunch
 (*    gtATStartGame *) , amNothing
 (*   gtATFinishGame *) , amNothing
@@ -2276,7 +2277,6 @@
 (*gtSniperRifleShot *) , amSniperRifle
 (*        gtJetpack *) , amJetpack
 (*        gtMolotov *) , amMolotov
-(*     gtExplosives *) , amNothing
 (*          gtBirdy *) , amBirdy
 (*            gtEgg *) , amBirdy
 (*         gtPortal *) , amPortalGun