diff -r fd91aa100ce0 -r efc75c2d3be9 QTfrontend/game.cpp
--- a/QTfrontend/game.cpp	Fri Jul 20 18:48:04 2012 -0400
+++ b/QTfrontend/game.cpp	Thu Aug 30 12:13:24 2012 -0400
@@ -21,7 +21,6 @@
 #include <QUuid>
 #include <QColor>
 #include <QStringListModel>
-#include <QTextStream>
 
 #include "game.h"
 #include "hwconsts.h"
@@ -30,7 +29,8 @@
 #include "teamselect.h"
 #include "KB.h"
 #include "proto.h"
-#include "ThemeModel.h"
+
+#include <QTextStream>
 
 QString training, campaign; // TODO: Cleaner solution?
 
@@ -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(15).toBool() || !gamecfg->schemeData(21).toBool()) HWProto::addStringToBuffer(buf, QString("eammstore"));
+            if(!gamecfg->schemeData(21).toBool()) HWProto::addStringToBuffer(buf, QString("eammstore"));
             HWProto::addStringListToBuffer(buf,
                                            team.teamGameConfig(gamecfg->getInitHealth()));
             ;