diff options
| author | Kelly Martin | 2012-07-16 20:52:03 -0500 |
|---|---|---|
| committer | Kelly Martin | 2012-07-16 20:52:03 -0500 |
| commit | 70ac2ffa17a8f233872797bce6cafa994ce21697 (patch) | |
| tree | b8e6cee98ef0af974ead8b75b1d6b85bea60884c /plugins/zone.cpp | |
| parent | 2cafe540d588683495d879eb712ae4a7dacda4c2 (diff) | |
| parent | aee15db75fdb4cb812788e13db4c83da6672d951 (diff) | |
| download | dfhack-70ac2ffa17a8f233872797bce6cafa994ce21697.tar.gz dfhack-70ac2ffa17a8f233872797bce6cafa994ce21697.tar.bz2 dfhack-70ac2ffa17a8f233872797bce6cafa994ce21697.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/zone.cpp')
| -rw-r--r-- | plugins/zone.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/plugins/zone.cpp b/plugins/zone.cpp index 52ea5c07..fc89fecc 100644 --- a/plugins/zone.cpp +++ b/plugins/zone.cpp @@ -1856,14 +1856,18 @@ command_result df_zone (color_ostream &out, vector <string> & parameters) // if followed by another parameter, check if it's numeric if(i < parameters.size()-1) { - stringstream ss(parameters[i+1]); - int new_building = -1; - ss >> new_building; - if(new_building != -1) + auto & str = parameters[i+1]; + if(str.size() > 0 && str[0] >= '0' && str[0] <= '9') { - i++; - target_building = new_building; - out << "Assign selected unit(s) to building #" << target_building <<std::endl; + stringstream ss(parameters[i+1]); + int new_building = -1; + ss >> new_building; + if(new_building != -1) + { + i++; + target_building = new_building; + out << "Assign selected unit(s) to building #" << target_building <<std::endl; + } } } if(target_building == -1) |
