equal
deleted
inserted
replaced
167 else |
167 else |
168 { |
168 { |
169 // return if max playing teams reached |
169 // return if max playing teams reached |
170 if(framePlaying->isFullTeams()) return; |
170 if(framePlaying->isFullTeams()) return; |
171 // dont playing team => playing |
171 // dont playing team => playing |
|
172 itDontPlay->setColor(framePlaying->getNextColor()); |
172 team=*itDontPlay; // for net team info saving in framePlaying (we have only name with netID from network) |
173 team=*itDontPlay; // for net team info saving in framePlaying (we have only name with netID from network) |
173 itDontPlay->setColor(framePlaying->getNextColor()); |
|
174 curPlayingTeams.push_back(*itDontPlay); |
174 curPlayingTeams.push_back(*itDontPlay); |
175 if(!m_acceptOuter) emit teamWillPlay(*itDontPlay); |
175 if(!m_acceptOuter) emit teamWillPlay(*itDontPlay); |
176 m_curNotPlayingTeams.erase(itDontPlay); |
176 m_curNotPlayingTeams.erase(itDontPlay); |
177 } |
177 } |
178 |
178 |
293 return m_curNotPlayingTeams; |
293 return m_curNotPlayingTeams; |
294 } |
294 } |
295 |
295 |
296 void TeamSelWidget::pre_changeTeamStatus(HWTeam team) |
296 void TeamSelWidget::pre_changeTeamStatus(HWTeam team) |
297 { |
297 { |
298 team.setColor(framePlaying->getNextColor()); |
298 //team.setColor(framePlaying->getNextColor()); |
299 emit acceptRequested(team); |
299 emit acceptRequested(team); |
300 } |
300 } |