Merge branch 'master' of zidekm1@rtime.felk.cvut.cz:/var/git/eurobot

diff --git a/src/robofsm/competition.cc b/src/robofsm/competition.cc
index e701a35d71f5882aceba0d8d52cb7ba489af8b4d..a0604fdaf32204cc1d64e055db6a316dd4223341 100644 (file)
--- a/src/robofsm/competition.cc
+++ b/src/robofsm/competition.cc
@@ -365,6 +365,7 @@ static void robot_goto_next_puck_in_sequence(int lot, int puck_number)
 FSM_STATE(collect_free_pucks)
 {
        static const int lot = 7;  // this variable location is temporary...; going to be received from the camera
+//     static const int lot = robot.game_conf; // +1?? game_conf is 0..9 
        switch (FSM_EVENT) {
                case EV_ENTRY:
                        robot_goto_next_puck_in_sequence(lot, free_puck_to_try_to_get_next);