diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server.cpp | 3 | ||||
| -rw-r--r-- | src/sky.cpp | 6 | ||||
| -rw-r--r-- | src/threading/thread.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/server.cpp b/src/server.cpp index e0a15ab87..5bdf22c7e 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3237,7 +3237,8 @@ bool Server::rollbackRevertActions(const std::list<RollbackAction> &actions, ServerMap *map = (ServerMap*)(&m_env->getMap()); // Fail if no actions to handle - if(actions.empty()){ + if (actions.empty()) { + assert(log); log->push_back("Nothing to do."); return false; } diff --git a/src/sky.cpp b/src/sky.cpp index 03afc4464..e2f578cb6 100644 --- a/src/sky.cpp +++ b/src/sky.cpp @@ -141,9 +141,9 @@ void Sky::render() suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.7 + m_time_brightness * 0.5)); suncolor_f.b = MYMAX(0.0, m_brightness * 0.95); video::SColorf suncolor2_f(1, 1, 1, 1); - suncolor_f.r = 1; - suncolor_f.g = MYMAX(0.3, MYMIN(1.0, 0.85 + m_time_brightness * 0.5)); - suncolor_f.b = MYMAX(0.0, m_brightness); + suncolor2_f.r = 1; + suncolor2_f.g = MYMAX(0.3, MYMIN(1.0, 0.85 + m_time_brightness * 0.5)); + suncolor2_f.b = MYMAX(0.0, m_brightness); float moonsize = 0.04; video::SColorf mooncolor_f(0.50, 0.57, 0.65, 1); diff --git a/src/threading/thread.h b/src/threading/thread.h index dab5d0ec7..cea92226f 100644 --- a/src/threading/thread.h +++ b/src/threading/thread.h @@ -152,7 +152,7 @@ private: std::mutex m_mutex; std::mutex m_start_finished_mutex; - std::thread *m_thread_obj; + std::thread *m_thread_obj = nullptr; #ifdef _AIX |