From de9eeca55642ab63c9bc61a1ba9ea81da5c27888 Mon Sep 17 00:00:00 2001 From: Menche Date: Sun, 17 Jul 2016 18:54:43 -0700 Subject: [PATCH] kill some unused variables, grar --- src/clouds.h | 1 - src/guiMainMenu.cpp | 6 ++++-- src/guiMainMenu.h | 2 ++ src/http.h | 4 +--- src/sky.h | 1 - 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/clouds.h b/src/clouds.h index d1fe4f8..98747d6 100644 --- a/src/clouds.h +++ b/src/clouds.h @@ -81,7 +81,6 @@ private: video::SMaterial m_material; core::aabbox3d m_box; float m_cloud_y; - float m_brightness; video::SColorf m_color; u32 m_seed; v2f m_camera_pos; diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index a546645..4926647 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -58,8 +58,10 @@ GUIMainMenu::GUIMainMenu(gui::IGUIEnvironment* env, GUIModalMenu(env, parent, id, menumgr), m_data(data), m_accepted(false), - m_gamecallback(gamecallback), - m_sound(sound) +#if USE_SOUND == 1 + m_sound(sound), +#endif + m_gamecallback(gamecallback) { assert(m_data); this->env = env; diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h index 3f00957..8921ee7 100644 --- a/src/guiMainMenu.h +++ b/src/guiMainMenu.h @@ -184,7 +184,9 @@ private: MainMenuData *m_data; bool m_accepted; IGameCallback *m_gamecallback; +#if USE_SOUND == 1 ISoundManager *m_sound; +#endif gui::IGUIEnvironment* env; gui::IGUIElement* parent; diff --git a/src/http.h b/src/http.h index d407bab..5135eab 100644 --- a/src/http.h +++ b/src/http.h @@ -103,8 +103,7 @@ class HTTPRemoteClient { public: HTTPRemoteClient(TCPSocket *sock, HTTPServer *server): - m_response(""), - m_auth(false) + m_response("") { m_socket = sock; m_server = server; @@ -134,7 +133,6 @@ private: HTTPRequestHeaders m_recv_headers; HTTPResponseHeaders m_send_headers; std::string m_response; - bool m_auth; TCPSocket *m_socket; HTTPServer *m_server; }; diff --git a/src/sky.h b/src/sky.h index 4e81a08..adf1ba2 100644 --- a/src/sky.h +++ b/src/sky.h @@ -84,7 +84,6 @@ private: video::SColor m_skycolor; video::SColorf m_cloudcolor_f; v3f m_stars[SKY_STAR_COUNT]; - u16 m_star_indices[SKY_STAR_COUNT*4]; video::S3DVertex m_star_vertices[SKY_STAR_COUNT*4]; };