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

Fix a shitloads of warnings on VS

Browse Source 
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
This commit is contained in:
Lynix
2015-11-25 18:19:26 +01:00
parent c6d16c0128
commit bbe8a776e8
42 changed files with 406 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Nazara/Core/PrimitiveList.cpp
View File

@@ -73,37 +73,21 @@ namespace Nz
m_primitives.push_back(Primitive::UVSphere(size, sliceCount, stackCount, position, rotation));
}
Primitive& PrimitiveList::GetPrimitive(unsigned int i)
Primitive& PrimitiveList::GetPrimitive(std::size_t i)
{
#if NAZARA_CORE_SAFE
if (i >= m_primitives.size())
{
NazaraError("Primitive index out of range (" + String::Number(i) + " >= " + String::Number(m_primitives.size()) + ')');
static Primitive dummy;
return dummy;
}
#endif
NazaraAssert(i < m_primitives.size(), "Primitive index out of range");
return m_primitives[i];
}
const Primitive& PrimitiveList::GetPrimitive(unsigned int i) const
const Primitive& PrimitiveList::GetPrimitive(std::size_t i) const
{
#if NAZARA_CORE_SAFE
if (i >= m_primitives.size())
{
NazaraError("Primitive index out of range (" + String::Number(i) + " >= " + String::Number(m_primitives.size()) + ')');
static Primitive dummy;
return dummy;
}
#endif
NazaraAssert(i < m_primitives.size(), "Primitive index out of range");
return m_primitives[i];
}
unsigned int PrimitiveList::GetSize() const
std::size_t PrimitiveList::GetSize() const
{
return m_primitives.size();
}