diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2014-10-07 17:01:07 +1000 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2014-10-19 15:33:08 +0200 |
| commit | 076c5ee2234c7f217f8941bbbd710d317485ccbc (patch) | |
| tree | d59d05cf111a7fb79960878a9d51864ea6ff5b97 /src/sky.cpp | |
| parent | fe8ef1be59399a327d9df50a0ab823bb2731de79 (diff) | |
| download | minetest-076c5ee2234c7f217f8941bbbd710d317485ccbc.tar.gz minetest-076c5ee2234c7f217f8941bbbd710d317485ccbc.tar.bz2 minetest-076c5ee2234c7f217f8941bbbd710d317485ccbc.zip | |
Various uninitialised variable fixes
sky.cpp: m_bgcolor.getAlpha() was being used before initialised
mesh related: m_highlight_mesh_color was being used uninitialised
Diffstat (limited to 'src/sky.cpp')
| -rw-r--r-- | src/sky.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/sky.cpp b/src/sky.cpp index 17d8d46ce..b5706f4e3 100644 --- a/src/sky.cpp +++ b/src/sky.cpp @@ -573,6 +573,20 @@ void Sky::update(float time_of_day, float time_brightness, m_clouds_visible = false; } + video::SColor bgcolor_bright = m_bgcolor_bright_f.toSColor(); + m_bgcolor = video::SColor( + 255, + bgcolor_bright.getRed() * m_brightness, + bgcolor_bright.getGreen() * m_brightness, + bgcolor_bright.getBlue() * m_brightness); + + video::SColor skycolor_bright = m_skycolor_bright_f.toSColor(); + m_skycolor = video::SColor( + 255, + skycolor_bright.getRed() * m_brightness, + skycolor_bright.getGreen() * m_brightness, + skycolor_bright.getBlue() * m_brightness); + // Horizon coloring based on sun and moon direction during sunset and sunrise video::SColor pointcolor = video::SColor(255, 255, 255, m_bgcolor.getAlpha()); if (m_directional_colored_fog) { @@ -606,25 +620,7 @@ void Sky::update(float time_of_day, float time_brightness, // calculate the blend color pointcolor = m_mix_scolor(pointcolor_moon, pointcolor_sun, pointcolor_blend); } - } - - video::SColor bgcolor_bright = m_bgcolor_bright_f.toSColor(); - m_bgcolor = video::SColor( - 255, - bgcolor_bright.getRed() * m_brightness, - bgcolor_bright.getGreen() * m_brightness, - bgcolor_bright.getBlue() * m_brightness); - if (m_directional_colored_fog) { m_bgcolor = m_mix_scolor(m_bgcolor, pointcolor, m_horizon_blend() * 0.5); - } - - video::SColor skycolor_bright = m_skycolor_bright_f.toSColor(); - m_skycolor = video::SColor( - 255, - skycolor_bright.getRed() * m_brightness, - skycolor_bright.getGreen() * m_brightness, - skycolor_bright.getBlue() * m_brightness); - if (m_directional_colored_fog) { m_skycolor = m_mix_scolor(m_skycolor, pointcolor, m_horizon_blend() * 0.25); } |