Split trees into trees-on-land and trees-on-water.

This gets rid of the hacks where the same tree would turn to either floor or
shallow water depending on the branch it is in.  Also, only a few methods of
destroying trees obeyed the water rule.

1 files changed, 2 insertions, 1 deletions

diff --git a/crawl-ref/source/colour.h b/crawl-ref/source/colour.h
index 3f58f82353..034c4aa23a 100644
--- a/crawl-ref/source/colour.h
+++ b/crawl-ref/source/colour.h
@@ -47,10 +47,11 @@ enum element_type
     ETC_BONE,           // colour of bone
     ETC_ELVEN_BRICK,    // colour of the walls in the Elven Halls
     ETC_WAVES,          // cyan, with regularly occurring lightcyan waves
-    ETC_TREE,           // colour of trees
+    ETC_TREE,           // colour of trees on land
     ETC_RANDOM,         // any colour (except BLACK)
     ETC_TORNADO,        // twisting swirls of gray
     ETC_LIQUEFIED,      // ripples of yellow and brown.
+    ETC_SWAMP_TREE,     // colour of trees on water
     ETC_FIRST_LUA = 96, // colour indices have to be <128
 };