moved m_waves_height in more proper place

source/main/gfx/Water.cpp

@@ -538,7 +538,7 @@ float Water::CalcWavesHeight(Vector3 pos)
     {
         // calculate the amplitude that this wave will have. wavetrains[i].amplitude is read from the config
         // upper limit: prevent too big waves by setting an upper limit
-        float amp = std::min(m_wavetrain_defs[i].amplitude * (waveheight + m_waves_height), m_wavetrain_defs[i].maxheight);
+        float amp = std::min(m_wavetrain_defs[i].amplitude * waveheight, m_wavetrain_defs[i].maxheight);
         // now the main thing:
         // calculate the sinus with the values of the config file and add it to the result
         result += amp * sin(Math::TWO_PI * ((time_sec * m_wavetrain_defs[i].wavespeed + m_wavetrain_defs[i].dir_sin * pos.x + m_wavetrain_defs[i].dir_cos * pos.z) / m_wavetrain_defs[i].wavelength));
@@ -652,6 +652,7 @@ float Water::GetWaveHeight(Vector3 pos)
     //  (mapsize.z * m_waterplane_mesh_scale) / 2 = terrain height / 2
     // calculate distance to the center of the terrain and divide by 3.000.000
     float waveheight = (pos - Vector3((m_map_size.x * m_waterplane_mesh_scale) * 0.5, m_water_height, (m_map_size.z * m_waterplane_mesh_scale) * 0.5)).squaredLength() / 3000000.0;
+    waveheight += m_waves_height;
 
     return waveheight;
 }