Fixed issues related to DecorSwim and WaterCheck
Added terrainHeight to WaterInfo since we already retrieve it, saves duplicate calls into TerrainHeightMap by callers
Added GetWaterAndTerrainSurface (returns both) and GetWaterOrTerrainSurface (returns the max of them) to WaterLevel