From 6f8b0cef965d604aa53997df3a90b2ec52269dec Mon Sep 17 00:00:00 2001 From: engineer_apple Date: Sat, 22 Feb 2020 22:01:57 +0000 Subject: [PATCH] remove source warnings git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6091 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CGUIContextMenu.cpp | 1 + source/Irrlicht/CMY3DMeshFileLoader.h | 4 +++- source/Irrlicht/COBJMeshFileLoader.cpp | 2 ++ source/Irrlicht/COSOperator.cpp | 2 +- source/Irrlicht/CTRTextureWire2.cpp | 2 ++ source/Irrlicht/CXMeshFileLoader.cpp | 6 ++++++ 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/source/Irrlicht/CGUIContextMenu.cpp b/source/Irrlicht/CGUIContextMenu.cpp index c28d30ab..3a6484be 100644 --- a/source/Irrlicht/CGUIContextMenu.cpp +++ b/source/Irrlicht/CGUIContextMenu.cpp @@ -88,6 +88,7 @@ u32 CGUIContextMenu::insertItem(u32 idx, const wchar_t* text, s32 commandId, boo s.IsSeparator = (text == 0); s.SubMenu = 0; s.CommandId = commandId; + s.PosY = 0; if (hasSubMenu) { diff --git a/source/Irrlicht/CMY3DMeshFileLoader.h b/source/Irrlicht/CMY3DMeshFileLoader.h index 0c29802e..c0369d49 100644 --- a/source/Irrlicht/CMY3DMeshFileLoader.h +++ b/source/Irrlicht/CMY3DMeshFileLoader.h @@ -92,7 +92,9 @@ private: { SMyMaterialEntry () : Texture1FileName("null"), Texture2FileName("null"), - Texture1(0), Texture2(0), MaterialType(video::EMT_SOLID) {} + Texture1(0), Texture2(0), MaterialType(video::EMT_SOLID) { + Header.Name[0] = 0; + } SMyMaterialHeader Header; core::stringc Texture1FileName; diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp index d4ce82ed..17dcec99 100644 --- a/source/Irrlicht/COBJMeshFileLoader.cpp +++ b/source/Irrlicht/COBJMeshFileLoader.cpp @@ -182,6 +182,8 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file) smoothingGroup=0; else smoothingGroup=core::strtoul10(smooth); + + (void)smoothingGroup; // disable unused variable warnings } break; diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp index 332cca14..f4252b80 100644 --- a/source/Irrlicht/COSOperator.cpp +++ b/source/Irrlicht/COSOperator.cpp @@ -185,7 +185,7 @@ bool COSOperator::getProcessorSpeedMHz(u32* MHz) const if (file) { char buffer[1024]; - fread(buffer, 1, 1024, file); + (void)fread(buffer, 1, 1024, file); buffer[1023]=0; core::stringc str(buffer); s32 pos = str.find("cpu MHz"); diff --git a/source/Irrlicht/CTRTextureWire2.cpp b/source/Irrlicht/CTRTextureWire2.cpp index f97e0e1b..b77b788f 100644 --- a/source/Irrlicht/CTRTextureWire2.cpp +++ b/source/Irrlicht/CTRTextureWire2.cpp @@ -115,7 +115,9 @@ CTRTextureWire2::CTRTextureWire2(CBurningVideoDriver* driver) void CTRTextureWire2::renderLine ( const s4DVertex *a,const s4DVertex *b, int renderZero) const { int pitch0 = RenderTarget->getDimension().Width << VIDEO_SAMPLE_GRANULARITY; +#ifdef USE_ZBUFFER int pitch1 = RenderTarget->getDimension().Width << 2; +#endif //todo:! int aposx = fill_convention_none(a->Pos.x); diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp index 89c2c77a..feddb408 100644 --- a/source/Irrlicht/CXMeshFileLoader.cpp +++ b/source/Irrlicht/CXMeshFileLoader.cpp @@ -912,6 +912,12 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh) s16 uv2type = -1; s16 tangenttype = -1; s16 binormaltype = -1; + + (void)tangentpos; // disable unused variable warnings + (void)binormalpos; // disable unused variable warnings + (void)tangenttype; // disable unused variable warnings + (void)binormaltype; // disable unused variable warnings + for (j=0; j