diff -r 65602f1ef0f8 -r f77bb02b669f QTfrontend/team.cpp --- a/QTfrontend/team.cpp Mon Jan 30 23:20:28 2012 +0100 +++ b/QTfrontend/team.cpp Mon Jan 30 17:32:18 2012 -0500 @@ -83,9 +83,9 @@ HWTeam::HWTeam() : QObject(0) - , m_difficulty(0) - , m_numHedgehogs(4) - , m_isNetTeam(false) + , m_difficulty(0) + , m_numHedgehogs(4) + , m_isNetTeam(false) { m_name = QString("Team"); for (int i = 0; i < HEDGEHOGS_PER_TEAM; i++) @@ -110,23 +110,23 @@ } HWTeam::HWTeam(const HWTeam & other) : - QObject(0) - , OldTeamName(other.OldTeamName) - , m_name(other.m_name) - , m_grave(other.m_grave) - , m_fort(other.m_fort) - , m_flag(other.m_flag) - , m_voicepack(other.m_voicepack) - , m_hedgehogs(other.m_hedgehogs) - , m_difficulty(other.m_difficulty) - , m_binds(other.m_binds) - , m_numHedgehogs(other.m_numHedgehogs) - , m_color(other.m_color) - , m_isNetTeam(other.m_isNetTeam) - , m_owner(other.m_owner) - , m_campaignProgress(other.m_campaignProgress) - , m_rounds(other.m_rounds) - , m_wins(other.m_wins) + QObject(0) + , OldTeamName(other.OldTeamName) + , m_name(other.m_name) + , m_grave(other.m_grave) + , m_fort(other.m_fort) + , m_flag(other.m_flag) + , m_voicepack(other.m_voicepack) + , m_hedgehogs(other.m_hedgehogs) + , m_difficulty(other.m_difficulty) + , m_binds(other.m_binds) + , m_numHedgehogs(other.m_numHedgehogs) + , m_color(other.m_color) + , m_isNetTeam(other.m_isNetTeam) + , m_owner(other.m_owner) + , m_campaignProgress(other.m_campaignProgress) + , m_rounds(other.m_rounds) + , m_wins(other.m_wins) // , AchievementProgress(other.AchievementProgress) { @@ -266,28 +266,30 @@ for (int t = 0; t < m_numHedgehogs; t++) { - sl.push_back(QString("eaddhh %1 %2 %3") - .arg(QString::number(m_difficulty), - QString::number(InitHealth), - m_hedgehogs[t].Name)); - sl.push_back(QString("ehat %1") - .arg(m_hedgehogs[t].Hat)); + sl.push_back(QString("eaddhh %1 %2 %3") + .arg(QString::number(m_difficulty), + QString::number(InitHealth), + m_hedgehogs[t].Name)); + sl.push_back(QString("ehat %1") + .arg(m_hedgehogs[t].Hat)); } return sl; } bool HWTeam::isNetTeam() const { - return m_isNetTeam; + return m_isNetTeam; } -bool HWTeam::operator==(const HWTeam& t1) const { - return m_name==t1.m_name; +bool HWTeam::operator==(const HWTeam& t1) const +{ + return m_name==t1.m_name; } -bool HWTeam::operator<(const HWTeam& t1) const { - return m_name