# HG changeset patch
# User nemo
# Date 1339353400 14400
# Node ID 9ecd5bc9810b9bc2094595fcfe1e52d9c2050b9e
# Parent  53f5e48b837590da08c133f23037eb6a8bff696c
Ensure that Clan ammo always takes precedence over Per Hog Ammo in the flags.  It'd be best for the user sake if these buttons acted more like radio buttons.

diff -r 53f5e48b8375 -r 9ecd5bc9810b QTfrontend/game.cpp
--- a/QTfrontend/game.cpp	Sat Jun 09 17:15:45 2012 -0400
+++ b/QTfrontend/game.cpp	Sun Jun 10 14:36:40 2012 -0400
@@ -98,7 +98,7 @@
             HWProto::addStringToBuffer(buf, QString("eammprob %1").arg(ammostr.mid(cAmmoNumber, cAmmoNumber)));
             HWProto::addStringToBuffer(buf, QString("eammdelay %1").arg(ammostr.mid(2 * cAmmoNumber, cAmmoNumber)));
             HWProto::addStringToBuffer(buf, QString("eammreinf %1").arg(ammostr.mid(3 * cAmmoNumber, cAmmoNumber)));
-            if(!gamecfg->schemeData(21).toBool()) HWProto::addStringToBuffer(buf, QString("eammstore"));
+            if(gamecfg->schemeData(15).toBool() || !gamecfg->schemeData(21).toBool()) HWProto::addStringToBuffer(buf, QString("eammstore"));
             HWProto::addStringListToBuffer(buf,
                                            team.teamGameConfig(gamecfg->getInitHealth()));
             ;
diff -r 53f5e48b8375 -r 9ecd5bc9810b hedgewars/uCommandHandlers.pas
--- a/hedgewars/uCommandHandlers.pas	Sat Jun 09 17:15:45 2012 -0400
+++ b/hedgewars/uCommandHandlers.pas	Sun Jun 10 14:36:40 2012 -0400
@@ -763,7 +763,8 @@
 
 procedure chGameFlags(var s: shortstring);
 begin
-GameFlags:= StrToInt(s)
+GameFlags:= StrToInt(s);
+if GameFlags and gfSharedAmmo <> 0 then GameFlags:= GameFlags and not gfPerHogAmmo
 end;
 
 procedure chHedgehogTurnTime(var s: shortstring);