From 836c011b33017035febda60763526c90fb8a6e8f Mon Sep 17 00:00:00 2001
From: Japa Mala Illo <japa.mala.illo@gmail.com>
Date: Sun, 28 Oct 2018 09:33:26 -0500
Subject: [PATCH] Changed the plant tiles to more descriptive names.

---
 .vscode/c_cpp_properties.json                 | 21 +++++++++++++
 library/xml                                   |  2 +-
 .../remotefortressreader.cpp                  | 30 +++++++++----------
 3 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 .vscode/c_cpp_properties.json

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 000000000..7d2c32d7d
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -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
+}
\ No newline at end of file
diff --git a/library/xml b/library/xml
index 11faf4afe..8f5955b08 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 11faf4afe03b8810fe3c681e0c1e660c0abd5afd
+Subproject commit 8f5955b08c0dab7f2fd7d6432df054b82a3c4f4b
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 8c1c9c33a..96ea6b5eb 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -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 << "╨";