sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility: Fix some warnings

Browse Source 
Former-commit-id: 743eae3bfca7871bdd4c180c53a1ee09fa9dcc5a
This commit is contained in:
Lynix
2016-05-03 23:18:08 +02:00
parent a6c13f85af
commit d678951c33
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Utility/Formats/DDSLoader.cpp
View File

@@ -65,7 +65,7 @@ namespace Nz
headerDX10.resourceDimension = D3D10_RESOURCE_DIMENSION_UNKNOWN; headerDX10.resourceDimension = D3D10_RESOURCE_DIMENSION_UNKNOWN;
} }
if (header.flags & DDSD_WIDTH == 0) if ((header.flags & DDSD_WIDTH) == 0)
NazaraWarning("Ill-formed DDS file, doesn't have a width flag"); NazaraWarning("Ill-formed DDS file, doesn't have a width flag");
unsigned int width = std::max(header.width, 1U); unsigned int width = std::max(header.width, 1U);
@@ -141,7 +141,7 @@ namespace Nz
{ {
if (header.ddsCaps[1] & DDSCAPS2_CUBEMAP) if (header.ddsCaps[1] & DDSCAPS2_CUBEMAP)
{ {
if (header.ddsCaps[1] & DDSCAPS2_CUBEMAP_ALLFACES != DDSCAPS2_CUBEMAP_ALLFACES) if ((header.ddsCaps[1] & DDSCAPS2_CUBEMAP_ALLFACES) != DDSCAPS2_CUBEMAP_ALLFACES)
{ {
NazaraError("Partial cubemap are not yet supported, sorry"); NazaraError("Partial cubemap are not yet supported, sorry");
return false; return false;

2
src/Nazara/Utility/SubMesh.cpp
View File

@@ -209,5 +209,5 @@ namespace Nz
void SubMesh::SetMaterialIndex(unsigned int matIndex) void SubMesh::SetMaterialIndex(unsigned int matIndex)
{ {
m_matIndex = matIndex; m_matIndex = matIndex;
} }
} }