diff -r 613998625a3c -r 710f3ced8934 QTfrontend/team.cpp --- a/QTfrontend/team.cpp Tue Jun 19 21:17:05 2012 +0200 +++ b/QTfrontend/team.cpp Tue Jun 19 21:20:08 2012 +0200 @@ -26,6 +26,7 @@ #include "team.h" #include "hwform.h" +#include "DataManager.h" HWTeam::HWTeam(const QString & teamname) : QObject(0) @@ -150,9 +151,9 @@ m_fort = other.m_fort; m_flag = other.m_flag; m_voicepack = other.m_voicepack; -// m_hedgehogs = other.m_hedgehogs; + m_hedgehogs = other.m_hedgehogs; m_difficulty = other.m_difficulty; -// m_binds = other.m_binds; + m_binds = other.m_binds; m_numHedgehogs = other.m_numHedgehogs; m_color = other.m_color; m_isNetTeam = other.m_isNetTeam; @@ -351,12 +352,12 @@ QColor HWTeam::qcolor() const { - return colorsModel->item(m_color)->data().value(); + return DataManager::instance().colorsModel()->item(m_color)->data().value(); } void HWTeam::setColor(int color) { - m_color = color % colorsModel->rowCount(); + m_color = color % DataManager::instance().colorsModel()->rowCount(); }