--- a/hedgewars/CCHandlers.inc	Tue Feb 23 15:41:37 2010 +0000
+++ b/hedgewars/CCHandlers.inc	Tue Feb 23 19:25:38 2010 +0000
@@ -153,12 +153,9 @@
 	val(s, Gear^.Health);
 	TryDo(Gear^.Health > 0, 'Invalid hedgehog health', true);
 	PHedgehog(Gear^.Hedgehog)^.Team:= CurrentTeam;
-	//CurrentHedgehog^.AmmoStore:= ClansCount - 1; // FIXME HACK to get ammostores work
-// ClansCount above causes shared ammo across clans, have demo game that functions as of this revision.
-// need to find out why before restoring.
-// Also needs a frontend game flag.
-// Is *not* related to randomising clan order.
-	CurrentHedgehog^.AmmoStore:= TeamsCount - 1; // FIXME HACK to get ammostores work
+// Needs shared clan ammo game flag
+	CurrentHedgehog^.AmmoStore:= Clan^.ClanIndex; // FIXME HACK to get ammostores work
+	//CurrentHedgehog^.AmmoStore:= TeamsCount - 1; // FIXME HACK to get ammostores work
 	CurrentHedgehog^.Gear:= Gear;
 	CurrentHedgehog^.Name:= id;
     CurrHedgehog:= HedgehogsNumber;