Skip to content

Commit 8d3b8c7

Browse files
authored
Merge pull request #152 from Bollos00/master
Correction of multiple option Robot Color Yellow/Blue
2 parents 2880137 + bf2b12c commit 8d3b8c7

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/configwidget.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ ConfigWidget::ConfigWidget() {
4646
ADD_TO_ENUM(Division, "Division B");
4747
END_ENUM(game_vars, Division);
4848
ADD_VALUE(game_vars,Int, Robots_Count, 11, "Robots Count")
49+
ADD_VALUE(game_vars, String, ColorRobotBlue, "#0000ff", "Color Robot Blue")
50+
ADD_VALUE(game_vars, String, ColorRobotYellow, "#ffff00", "Color Robot Yellow")
51+
4952
VarListPtr fields_vars(new VarList("Field"));
5053
VarListPtr div_a_vars(new VarList("Division A"));
5154
VarListPtr div_b_vars(new VarList("Division B"));
@@ -150,15 +153,13 @@ ConfigWidget::ConfigWidget() {
150153
ADD_VALUE(vanishing_vars,Double,blue_team_vanishing,0,"Blue team")
151154
ADD_VALUE(vanishing_vars,Double,yellow_team_vanishing,0,"Yellow team")
152155
ADD_VALUE(vanishing_vars,Double,ball_vanishing,0,"Ball")
156+
153157
world=VarXML::read(world,(QDir::homePath() + QString("/.grsim.xml")).toStdString());
154158

155159

156160
std::string blueteam = v_BlueTeam->getString();
157161
geo_vars->removeChild(v_BlueTeam);
158162

159-
ADD_VALUE(comm_vars, String, ColorRobotBlue, "#0000ff", "Color Robot Blue ")
160-
ADD_VALUE(comm_vars, String, ColorRobotYellow, "#ffff00", "Color Robot Yellow")
161-
162163
std::string yellowteam = v_YellowTeam->getString();
163164
geo_vars->removeChild(v_YellowTeam);
164165

0 commit comments

Comments
 (0)