Revision 60a90290
\Fixed teleop to work with behaviors. Teleop currently has priority over behaviors
scout/scoutsim/src/scout.h | ||
---|---|---|
118 | 118 |
const wxImage& walls_image, |
119 | 119 |
wxColour background_color, |
120 | 120 |
wxColour sonar_color, |
121 |
world_state state); |
|
121 |
world_state state,std::string teleop_scoutname);
|
|
122 | 122 |
void paint(wxDC& dc); |
123 | 123 |
void set_sonar_visual(bool on); |
124 | 124 |
|
... | ... | |
155 | 155 |
wxBitmap *path_bitmap; |
156 | 156 |
bool sonar_visual_on; |
157 | 157 |
bool sonar_on; |
158 |
bool ignore_behavior; |
|
159 |
|
|
160 |
std::string current_teleop_scout; |
|
158 | 161 |
|
159 | 162 |
ros::NodeHandle node; |
160 | 163 |
|
Also available in: Unified diff