diff --git a/src/graphics/gpuparticles.cpp b/src/graphics/gpuparticles.cpp index f33d9e0ab..360a45813 100644 --- a/src/graphics/gpuparticles.cpp +++ b/src/graphics/gpuparticles.cpp @@ -78,6 +78,23 @@ ParticleSystemProxy::ParticleSystemProxy(bool createDefaultEmitter, glGenVertexArrays(1, ¤t_rendering_vao); glGenVertexArrays(1, &non_current_rendering_vao); size_increase_factor = 0.; + + // We set these later but avoid coverity report them + heighmapbuffer = 0; + heightmaptexture = 0; + current_simulation_vao = 0; + non_currenthm__simulation_vao = 0; + current_hm_simulation_vao = 0; + current_rendering_flip_vao = 0; + non_current_rendering_flip_vao = 0; + has_height_map = false; + flip = false; + track_x = 0; + track_z = 0; + track_x_len = 0; + track_z_len = 0; + texture = 0; + if (quad_vertex_buffer) return; static const GLfloat quad_vertex[] = { diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index 52ad3e874..9fe2ac71f 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -1520,7 +1520,9 @@ void IrrDriver::displayFPS() { sprintf(buffer, "FPS: %i/%i/%i - Objects (P1:%d P2:%d T:%d) KTris - LightDst : ~%d", min, fps, max, object_count[SOLID_NORMAL_AND_DEPTH_PASS], object_count[SOLID_NORMAL_AND_DEPTH_PASS], object_count[TRANSPARENT_PASS], m_last_light_bucket_distance); - object_count[SOLID_NORMAL_AND_DEPTH_PASS] = object_count[SOLID_NORMAL_AND_DEPTH_PASS] = object_count[TRANSPARENT_PASS] = 0; + object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0; + object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0; + object_count[TRANSPARENT_PASS] = 0; } else { diff --git a/src/graphics/light.hpp b/src/graphics/light.hpp index c649bc495..1f17c5aad 100644 --- a/src/graphics/light.hpp +++ b/src/graphics/light.hpp @@ -66,8 +66,6 @@ public: protected: static core::aabbox3df box; - class ScreenQuad *sq; - //float m_radius; float m_color[3]; float m_energy; diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp index 5ae5fbe95..c218bec65 100644 --- a/src/graphics/post_processing.cpp +++ b/src/graphics/post_processing.cpp @@ -57,7 +57,11 @@ PostProcessing::PostProcessing(IVideoDriver* video_driver) io::IReadFile *areamap = irr_driver->getDevice()->getFileSystem()-> createMemoryReadFile((void *) AreaMap33, sizeof(AreaMap33), "AreaMap33", false); - if (!areamap) Log::fatal("postprocessing", "Failed to load the areamap"); + if (!areamap) + { + Log::fatal("postprocessing", "Failed to load the areamap"); + return; + } m_areamap = irr_driver->getVideoDriver()->getTexture(areamap); areamap->drop(); diff --git a/src/graphics/rain.cpp b/src/graphics/rain.cpp index 091025f72..8b2b54bc2 100644 --- a/src/graphics/rain.cpp +++ b/src/graphics/rain.cpp @@ -42,7 +42,7 @@ using namespace core; // The rain manager -Rain::Rain(Camera *camera, irr::scene::ISceneNode* parent) +Rain::Rain(Camera *camera, irr::scene::ISceneNode* parent) : m_thunder_sound(0) { m_lightning = camera->getIndex()==0; diff --git a/src/graphics/stkanimatedmesh.cpp b/src/graphics/stkanimatedmesh.cpp index 377db0bb9..815f6f200 100644 --- a/src/graphics/stkanimatedmesh.cpp +++ b/src/graphics/stkanimatedmesh.cpp @@ -106,9 +106,8 @@ void STKAnimatedMesh::render() } else { -#ifdef _DEBUG - os::Printer::log("Animated Mesh returned no mesh to render.", Mesh->getDebugName(), ELL_WARNING); -#endif + Log::error("animated mesh", "Animated Mesh returned no mesh to render."); + return; } driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);