# HG changeset patch # User unc0rr # Date 1408992779 -14400 # Node ID c3127602329527292ff83c952a258b04f82604ea # Parent 47e2189eae4464c6fc28e3d9768e20892288150a - Revert try to add local team on rejoin - Don't allow more than 8 teams in local game widget diff -r 47e2189eae44 -r c31276023295 QTfrontend/net/newnetclient.cpp --- a/QTfrontend/net/newnetclient.cpp Mon Aug 25 00:11:19 2014 +0400 +++ b/QTfrontend/net/newnetclient.cpp Mon Aug 25 22:52:59 2014 +0400 @@ -749,7 +749,6 @@ QStringList tmp = lst; tmp.removeFirst(); HWTeam team(tmp); - team.setNetTeam(team.owner() != mynick); emit AddNetTeam(team); return; } diff -r 47e2189eae44 -r c31276023295 QTfrontend/ui/widget/frameTeam.cpp --- a/QTfrontend/ui/widget/frameTeam.cpp Mon Aug 25 00:11:19 2014 +0400 +++ b/QTfrontend/ui/widget/frameTeam.cpp Mon Aug 25 22:52:59 2014 +0400 @@ -28,7 +28,7 @@ #include "DataManager.h" FrameTeams::FrameTeams(QWidget* parent) : - QFrame(parent), maxHedgehogsPerGame(48), overallHedgehogs(0), mainLayout(this), nonInteractive(false) + QFrame(parent), mainLayout(this), nonInteractive(false) { QPalette newPalette = palette(); newPalette.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00)); @@ -122,7 +122,7 @@ bool FrameTeams::isFullTeams() const { - return overallHedgehogs==maxHedgehogsPerGame; + return teamToWidget.size() >= 8; } void FrameTeams::emitTeamColorChanged(const HWTeam& team) diff -r 47e2189eae44 -r c31276023295 QTfrontend/ui/widget/frameTeam.h --- a/QTfrontend/ui/widget/frameTeam.h Mon Aug 25 00:11:19 2014 +0400 +++ b/QTfrontend/ui/widget/frameTeam.h Mon Aug 25 22:52:59 2014 +0400 @@ -53,8 +53,6 @@ void removeTeam(HWTeam team); private: - const int maxHedgehogsPerGame; - int overallHedgehogs; int currentColor; void emitTeamColorChanged(const HWTeam& team);