MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://github.com/jaxad0127/dfhack

develop
Petr Mrázek 2012-04-17 21:46:57 +02:00
parent bdd697f1a0 ebd21e9249
commit d0e9ab49e7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Brushes.h
Unescape Escape View File

@ -196,6 +196,12 @@ private:
Core *c_; Core *c_;
}; };
std::ostream &operator<<(std::ostream &stream, const Brush& brush) { inline std::ostream &operator<<(std::ostream &stream, const Brush& brush) {
stream << brush.str(); stream << brush.str();
return stream;
}
inline std::ostream &operator<<(std::ostream &stream, const Brush* brush) {
stream << brush->str();
return stream;
} }

3
plugins/tiletypes.cpp
Unescape Escape View File

@ -325,7 +325,7 @@ void printState(color_ostream &out)
{ {
out << "Filter: " << filter << std::endl out << "Filter: " << filter << std::endl
<< "Paint: " << paint << std::endl << "Paint: " << paint << std::endl
<< "Brush: " << brush->str() << std::endl; << "Brush: " << brush << std::endl;
} }
//zilpin: These two functions were giving me compile errors in VS2008, so I cheated with the C style loop below, just to get it to build. //zilpin: These two functions were giving me compile errors in VS2008, so I cheated with the C style loop below, just to get it to build.
@ -559,6 +559,7 @@ bool processTileType(color_ostream & out, TileType &paint, std::vector<std::stri
} }
else if (option == "all" || option == "a") else if (option == "all" || option == "a")
{ {
loc--;
for (; loc < end; loc++) for (; loc < end; loc++)
{ {
std::string param = params[loc]; std::string param = params[loc];