# HG changeset patch
# User koda
# Date 1362389610 -3600
# Node ID 0a6837edb278dff91fb56b25781be8decba2a175
# Parent  bf63104605fe0b0050c22e8319c1c4f60652e8d9# Parent  76a265f3967cfdd7abec020f735fd98475a76f91
merge for the win

diff -r bf63104605fe -r 0a6837edb278 QTfrontend/game.cpp
--- a/QTfrontend/game.cpp	Mon Mar 04 10:33:08 2013 +0100
+++ b/QTfrontend/game.cpp	Mon Mar 04 10:33:30 2013 +0100
@@ -352,7 +352,8 @@
     if(m_netSendBuffer.size())
     {
         emit SendNet(m_netSendBuffer);
-        
        m_netSendBuffer.clear();
+        
+        m_netSendBuffer.clear();
     }
 }
 
@@ -488,7 +489,7 @@
 void HWGame::sendCampaignVar(const QByteArray &varToSend)
 {
     QString varToFind(varToSend);
-    QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + campaignTeam + ".hwt", QSettings::IniFormat, 0);
+    QSettings teamfile(QString("physfs://Teams/%1.hwt").arg(campaignTeam), QSettings::IniFormat, 0);
     teamfile.setIniCodec("UTF-8");
     QString varValue = teamfile.value("Campaign " + campaign + "/" + varToFind, "").toString();
     QByteArray command;
@@ -505,7 +506,7 @@
     QString varToWrite = QString::fromUtf8(varVal.left(i));
     QString varValue = QString::fromUtf8(varVal.mid(i + 1));
 
-    QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + campaignTeam + ".hwt", QSettings::IniFormat, 0);
+    QSettings teamfile(QString("physfs://Teams/%1.hwt").arg(campaignTeam), QSettings::IniFormat, 0);
     teamfile.setIniCodec("UTF-8");
     teamfile.setValue("Campaign " + campaign + "/" + varToWrite, varValue);
 }
diff -r bf63104605fe -r 0a6837edb278 gameServer/HWProtoInRoomState.hs
--- a/gameServer/HWProtoInRoomState.hs	Mon Mar 04 10:33:08 2013 +0100
+++ b/gameServer/HWProtoInRoomState.hs	Mon Mar 04 10:33:30 2013 +0100
@@ -305,14 +305,14 @@
     let kickId = fromJust maybeClientId
     let kickCl = rnc `client` kickId
     let sameRoom = clientRoom rnc thisClientId == clientRoom rnc kickId
-    let notOnly2Clans = (length . group . sort . map teamcolor . teams $ rm) > 2
+    let notOnly2Players = (length . group . sort . map teamowner . teams $ rm) > 2
     return
         [KickRoomClient kickId |
             master
             && isJust maybeClientId
             && (kickId /= thisClientId)
             && sameRoom
-            && ((isNothing $ gameInfo rm) || notOnly2Clans || teamsInGame kickCl == 0)
+            && ((isNothing $ gameInfo rm) || notOnly2Players || teamsInGame kickCl == 0)
         ]