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

Merge branch 'master' of git://github.com/angavrilov/dfhack

develop
Quietust 2012-08-27 09:17:27 -05:00
parent faf3bdf2b7 5fed060d7d
commit 5ad9b82ace
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit abcb667bc832048552d8cbc8f4830936f8b63399 Subproject commit 3fc2e1569ff19953d11b6ea651bc9b8ca832b8a3

16
plugins/devel/rprobe.cpp
Unescape Escape View File

@ -79,7 +79,7 @@ command_result rprobe (color_ostream &out, vector <string> & parameters)
if (parameters.size() == 2) if (parameters.size() == 2)
{ {
if (parameters[0] == "wet") if (parameters[0] == "rai")
set_field = 0; set_field = 0;
else if (parameters[0] == "veg") else if (parameters[0] == "veg")
set_field = 1; set_field = 1;
@ -87,7 +87,7 @@ command_result rprobe (color_ostream &out, vector <string> & parameters)
set_field = 2; set_field = 2;
else if (parameters[0] == "evi") else if (parameters[0] == "evi")
set_field = 3; set_field = 3;
else if (parameters[0] == "hil") else if (parameters[0] == "dra")
set_field = 4; set_field = 4;
else if (parameters[0] == "sav") else if (parameters[0] == "sav")
set_field = 5; set_field = 5;
@ -117,7 +117,7 @@ command_result rprobe (color_ostream &out, vector <string> & parameters)
if (set && i == to_set) { if (set && i == to_set) {
if (set_field == 0) if (set_field == 0)
rd->wetness = set_val; rd->rainfall = set_val;
else if (set_field == 1) else if (set_field == 1)
rd->vegetation = set_val; rd->vegetation = set_val;
else if (set_field == 2) else if (set_field == 2)
@ -125,11 +125,11 @@ command_result rprobe (color_ostream &out, vector <string> & parameters)
else if (set_field == 3) else if (set_field == 3)
rd->evilness = set_val; rd->evilness = set_val;
else if (set_field == 4) else if (set_field == 4)
rd->hilliness = set_val; rd->drainage = set_val;
else if (set_field == 5) else if (set_field == 5)
rd->savagery = set_val; rd->savagery = set_val;
else if (set_field == 6) else if (set_field == 6)
rd->saltiness = set_val; rd->salinity = set_val;
} }
out << i << ": x = " << rg.x << ", y = " << rg.y; out << i << ": x = " << rg.x << ", y = " << rg.y;
@ -140,13 +140,13 @@ command_result rprobe (color_ostream &out, vector <string> & parameters)
" landmass_id: " << rd->landmass_id << " landmass_id: " << rd->landmass_id <<
" flags: " << hex << rd->flags.as_int() << dec << endl; " flags: " << hex << rd->flags.as_int() << dec << endl;
out << out <<
"wet: " << rd->wetness << " " << "rai: " << rd->rainfall << " " <<
"veg: " << rd->vegetation << " " << "veg: " << rd->vegetation << " " <<
"tem: " << rd->temperature << " " << "tem: " << rd->temperature << " " <<
"evi: " << rd->evilness << " " << "evi: " << rd->evilness << " " <<
"hil: " << rd->hilliness << " " << "dra: " << rd->drainage << " " <<
"sav: " << rd->savagery << " " << "sav: " << rd->savagery << " " <<
"sal: " << rd->saltiness; "sal: " << rd->salinity;
int32_t *p = (int32_t *)rd; int32_t *p = (int32_t *)rd;
int c = sizeof(*rd) / sizeof(int32_t); int c = sizeof(*rd) / sizeof(int32_t);