summaryrefslogtreecommitdiff
path: root/plugins/Brushes.h
diff options
context:
space:
mode:
authorJared Adams2012-05-10 22:06:43 -0600
committerJared Adams2012-05-10 22:06:43 -0600
commitf3ca3addbf4b842ceef567837edf768646ce07e7 (patch)
treefa6bdf281dd4f4b60991c0eae25c658472688c1e /plugins/Brushes.h
parentdce7f17fe78596734d0300021f95fb6f22e2b730 (diff)
parent92f069e20932b4ee2f781e5049bcab33a1dfed09 (diff)
downloaddfhack-f3ca3addbf4b842ceef567837edf768646ce07e7.tar.gz
dfhack-f3ca3addbf4b842ceef567837edf768646ce07e7.tar.bz2
dfhack-f3ca3addbf4b842ceef567837edf768646ce07e7.tar.xz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/Brushes.h')
-rw-r--r--plugins/Brushes.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/plugins/Brushes.h b/plugins/Brushes.h
index a408f47b..99e9e412 100644
--- a/plugins/Brushes.h
+++ b/plugins/Brushes.h
@@ -1,4 +1,9 @@
#pragma once
+#include <llimits.h>
+#include <sstream>
+#include <string>
+#include <stack>
+#include <set>
typedef vector <df::coord> coord_vec;
class Brush
@@ -60,10 +65,15 @@ public:
};
~RectangleBrush(){};
std::string str() const {
- if (x_ == 1 && y_ == 1 && z_ == 1) {
+ if (x_ == 1 && y_ == 1 && z_ == 1)
+ {
return "point";
- } else {
- return "rectangle";
+ }
+ else
+ {
+ std::ostringstream ss;
+ ss << "rect: " << x_ << "/" << y_ << "/" << z_ << std::endl;
+ return ss.str();
}
}
private: