diff --git a/src/graphics/core/color.h b/src/graphics/core/color.h index 10eb75fe..f3e6e5fb 100644 --- a/src/graphics/core/color.h +++ b/src/graphics/core/color.h @@ -63,10 +63,10 @@ struct Color : glm::vec4 //! Returns a string (r, g, b, a) inline std::string ToString() const { - std::stringstream s; - s.precision(3); - s << "(" << r << ", " << g << ", " << b << ", " << a << ")"; - return s.str(); + std::stringstream stream; + stream.precision(3); + stream << "(" << r << ", " << g << ", " << b << ", " << a << ")"; + return stream.str(); } inline bool operator==(const Color &other) const diff --git a/src/graphics/engine/lightning.cpp b/src/graphics/engine/lightning.cpp index e1c33a2a..99b74d91 100644 --- a/src/graphics/engine/lightning.cpp +++ b/src/graphics/engine/lightning.cpp @@ -366,8 +366,8 @@ void CLightning::StrikeAtPos(glm::vec3 pos) if (dist < deep) { - glm::vec3 pos = eye+((m_pos-eye)*0.2f); // like so close! - m_sound->Play(SOUND_BLITZ, pos); + glm::vec3 position = eye+((m_pos-eye)*0.2f); // like so close! + m_sound->Play(SOUND_BLITZ, position); m_camera->StartOver(CAM_OVER_EFFECT_LIGHTNING, m_pos, 1.0f); diff --git a/src/graphics/engine/planet.cpp b/src/graphics/engine/planet.cpp index a2c78552..8d185f50 100644 --- a/src/graphics/engine/planet.cpp +++ b/src/graphics/engine/planet.cpp @@ -98,7 +98,6 @@ void CPlanet::LoadTexture() void CPlanet::Draw() { - CDevice* device = m_engine->GetDevice(); float eyeDirH = m_engine->GetEyeDirH(); float eyeDirV = m_engine->GetEyeDirV(); diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp index 1d4a870d..c0e23219 100644 --- a/src/graphics/engine/pyro.cpp +++ b/src/graphics/engine/pyro.cpp @@ -826,7 +826,8 @@ bool CPyro::EventProcess(const Event &event) ParticleType type; int r = rand()%2; if (r == 0) type = PARTISMOKE1; - if (r == 1) type = PARTISMOKE2; + else type = PARTISMOKE2; + m_particle->CreateParticle(pos, speed, dim, type, 6.0f); } diff --git a/src/graphics/engine/terrain.cpp b/src/graphics/engine/terrain.cpp index 88393840..94aeea54 100644 --- a/src/graphics/engine/terrain.cpp +++ b/src/graphics/engine/terrain.cpp @@ -605,7 +605,7 @@ bool CTerrain::CreateMosaic(int ox, int oy, int step, int objRank) float pixel = 1.0f/256.0f; // 1 pixel cover (*) float dp = 1.0f/512.0f; - glm::vec2 uv; + glm::vec2 uv = { 0.0f, 0.0f }; for (int my = 0; my < m_textureSubdivCount; my++) {