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

Changed the plant tiles to more descriptive names.

develop
Japa Mala Illo 2018-10-28 09:33:26 -05:00
parent 7b6b83bdcf
commit 836c011b33
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.vscode/c_cpp_properties.json vendored
Unescape Escape View File

@ -0,0 +1,21 @@
{
"configurations": [
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
],
"windowsSdkVersion": "10.0.17134.0",
"compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.15.26726/bin/Hostx64/x64/cl.exe",
"cStandard": "c11",
"cppStandard": "c++17",
"intelliSenseMode": "msvc-x64"
}
],
"version": 4
}

2
library/xml

@ -1 +1 @@
Subproject commit 11faf4afe03b8810fe3c681e0c1e660c0abd5afd
Subproject commit 8f5955b08c0dab7f2fd7d6432df054b82a3c4f4b

30
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -323,13 +323,13 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
output << "░";
else if(tile.bits.branches)
{
if(tile.bits.thick_branches_1) // East Connection
if(tile.bits.connection_east)// East Connection
{
if(tile.bits.thick_branches_2) // South Connection
if(tile.bits.connection_south) // South Connection
{
if(tile.bits.thick_branches_3) // West Connection
if(tile.bits.connection_west) // West Connection
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "╬";
@ -346,7 +346,7 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
}
else
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "╠";
@ -364,9 +364,9 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
}
else
{
if(tile.bits.thick_branches_3) // West Connection
if(tile.bits.connection_west) // West Connection
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "╩";
@ -383,7 +383,7 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
}
else
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "╚";
@ -402,11 +402,11 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
}
else
{
if(tile.bits.thick_branches_2) // South Connection
if(tile.bits.connection_south) // South Connection
{
if(tile.bits.thick_branches_3) // West Connection
if(tile.bits.connection_west) // West Connection
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "╣";
@ -423,7 +423,7 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
}
else
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "║";
@ -441,9 +441,9 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
}
else
{
if(tile.bits.thick_branches_3) // West Connection
if(tile.bits.connection_west) // West Connection
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "╝";
@ -460,7 +460,7 @@ command_result Dump_Trees(color_ostream &out, vector<string> &parameters)
}
else
{
if(tile.bits.thick_branches_4) // North Connection
if(tile.bits.connection_north) // North Connection
{
if(tile.bits.trunk)
output << "╨";