102 } |
102 } |
103 |
103 |
104 void HWNewNet::AddTeam(const HWTeam & team) |
104 void HWNewNet::AddTeam(const HWTeam & team) |
105 { |
105 { |
106 QString cmd = QString("ADD_TEAM") + delimeter + |
106 QString cmd = QString("ADD_TEAM") + delimeter + |
107 team.TeamName + delimeter + |
107 team.name() + delimeter + |
108 team.teamColor.name() + delimeter + |
108 team.color().name() + delimeter + |
109 team.Grave + delimeter + |
109 team.grave() + delimeter + |
110 team.Fort + delimeter + |
110 team.fort() + delimeter + |
111 team.Voicepack + delimeter + |
111 team.voicepack() + delimeter + |
112 team.Flag + delimeter + |
112 team.flag() + delimeter + |
113 QString::number(team.difficulty); |
113 QString::number(team.difficulty()); |
114 |
114 |
115 for(int i = 0; i < 8; ++i) |
115 for(unsigned int i = 0; i < HEDGEHOGS_PER_TEAM; ++i) |
116 { |
116 { |
117 cmd.append(delimeter); |
117 cmd.append(delimeter); |
118 cmd.append(team.Hedgehogs[i].Name); |
118 cmd.append(team.hedgehog(i).Name); |
119 cmd.append(delimeter); |
119 cmd.append(delimeter); |
120 cmd.append(team.Hedgehogs[i].Hat); |
120 cmd.append(team.hedgehog(i).Hat); |
121 } |
121 } |
122 RawSendNet(cmd); |
122 RawSendNet(cmd); |
123 } |
123 } |
124 |
124 |
125 void HWNewNet::RemoveTeam(const HWTeam & team) |
125 void HWNewNet::RemoveTeam(const HWTeam & team) |
126 { |
126 { |
127 RawSendNet(QString("REMOVE_TEAM") + delimeter + team.TeamName); |
127 RawSendNet(QString("REMOVE_TEAM") + delimeter + team.name()); |
128 } |
128 } |
129 |
129 |
130 void HWNewNet::NewNick(const QString & nick) |
130 void HWNewNet::NewNick(const QString & nick) |
131 { |
131 { |
132 RawSendNet(QString("NICK%1%2").arg(delimeter).arg(nick)); |
132 RawSendNet(QString("NICK%1%2").arg(delimeter).arg(nick)); |
544 { |
544 { |
545 qWarning("Net: Bad TEAM_ACCEPTED message"); |
545 qWarning("Net: Bad TEAM_ACCEPTED message"); |
546 return; |
546 return; |
547 } |
547 } |
548 HWTeam tmptm(lst[1]); |
548 HWTeam tmptm(lst[1]); |
549 tmptm.numHedgehogs = lst[2].toUInt(); |
549 tmptm.setNumHedgehogs(lst[2].toUInt()); |
550 emit hhnumChanged(tmptm); |
550 emit hhnumChanged(tmptm); |
551 return; |
551 return; |
552 } |
552 } |
553 |
553 |
554 if (lst[0] == "TEAM_COLOR") { |
554 if (lst[0] == "TEAM_COLOR") { |
616 void HWNewNet::onHedgehogsNumChanged(const HWTeam& team) |
616 void HWNewNet::onHedgehogsNumChanged(const HWTeam& team) |
617 { |
617 { |
618 if (isChief) |
618 if (isChief) |
619 RawSendNet(QString("HH_NUM%1%2%1%3") |
619 RawSendNet(QString("HH_NUM%1%2%1%3") |
620 .arg(delimeter) |
620 .arg(delimeter) |
621 .arg(team.TeamName) |
621 .arg(team.name()) |
622 .arg(team.numHedgehogs)); |
622 .arg(team.numHedgehogs())); |
623 } |
623 } |
624 |
624 |
625 void HWNewNet::onTeamColorChanged(const HWTeam& team) |
625 void HWNewNet::onTeamColorChanged(const HWTeam& team) |
626 { |
626 { |
627 if (isChief) |
627 if (isChief) |
628 RawSendNet(QString("TEAM_COLOR%1%2%1%3") |
628 RawSendNet(QString("TEAM_COLOR%1%2%1%3") |
629 .arg(delimeter) |
629 .arg(delimeter) |
630 .arg(team.TeamName) |
630 .arg(team.name()) |
631 .arg(team.teamColor.name())); |
631 .arg(team.color().name())); |
632 } |
632 } |
633 |
633 |
634 void HWNewNet::onParamChanged(const QString & param, const QStringList & value) |
634 void HWNewNet::onParamChanged(const QString & param, const QStringList & value) |
635 { |
635 { |
636 if (isChief) |
636 if (isChief) |