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

Merge upstream

develop
jj 2012-05-12 23:52:13 +02:00
parent dfe86f9bd7 3da787c5c9
commit ea6e207290
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit 5707a6aa0c035348c8769058ed77b320f9b1436c Subproject commit 970bb0ae9530e9c0522cb0ca8fe357815d72fab1

16
plugins/Brushes.h
Unescape Escape View File

@ -1,4 +1,9 @@
#pragma once #pragma once
#include <llimits.h>
#include <sstream>
#include <string>
#include <stack>
#include <set>
typedef vector <df::coord> coord_vec; typedef vector <df::coord> coord_vec;
class Brush class Brush
@ -60,10 +65,15 @@ public:
}; };
~RectangleBrush(){}; ~RectangleBrush(){};
std::string str() const { std::string str() const {
if (x_ == 1 && y_ == 1 && z_ == 1) { if (x_ == 1 && y_ == 1 && z_ == 1)
{
return "point"; return "point";
} else { }
return "rectangle"; else
{
std::ostringstream ss;
ss << "rect: " << x_ << "/" << y_ << "/" << z_ << std::endl;
return ss.str();
} }
} }
private: private:

2
plugins/probe.cpp
Unescape Escape View File

@ -232,7 +232,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
int eindex = evi > 65 ? 2 : evi < 33 ? 0 : 1; int eindex = evi > 65 ? 2 : evi < 33 ? 0 : 1;
int surr = sindex + eindex * 3; int surr = sindex + eindex * 3;
char* surroundings[] = { "Serene", "Mirthful", "Joyous Wilds", "Calm", "Wilderness", "Untamed Wilds", "Sinister", "Haunted", "Terrifying" }; const char* surroundings[] = { "Serene", "Mirthful", "Joyous Wilds", "Calm", "Wilderness", "Untamed Wilds", "Sinister", "Haunted", "Terrifying" };
// biome, geolayer // biome, geolayer
out << "biome: " << des.bits.biome << " (" << out << "biome: " << des.bits.biome << " (" <<