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

Fixed some VS warnings

Browse Source 
Thanks to Fraggy again !


Former-commit-id: bd0eea66714701b065892d8b69d576e7b3615dd2
This commit is contained in:
Lynix
2013-09-21 00:10:10 +02:00
parent 6440d38c5c
commit 3167531b39
19 changed files with 95 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Renderer/ShaderProgram.cpp
View File

@@ -398,7 +398,7 @@ bool NzShaderProgram::LoadShaderFromFile(nzShaderType type, const NzString& file
return false;
}
unsigned int length = file.GetSize();
unsigned int length = static_cast<unsigned int>(file.GetSize());
NzString source;
source.Resize(length);

2
src/Nazara/Renderer/ShaderProgramManager.cpp
View File

@@ -110,7 +110,7 @@ const NzShaderProgram* NzShaderProgramManager::Get(const NzShaderProgramManagerP
{
NazaraDebug("File found");
unsigned int size = shaderFile.GetSize();
unsigned int size = static_cast<unsigned int>(shaderFile.GetSize());
NzByteArray binary;
binary.Resize(size);

6
src/Nazara/Renderer/Win32/ContextImpl.cpp
View File

@@ -19,7 +19,7 @@ NzContextImpl::NzContextImpl()
bool NzContextImpl::Activate()
{
return wglMakeCurrent(m_deviceContext, m_context);
return wglMakeCurrent(m_deviceContext, m_context) == TRUE;
}
bool NzContextImpl::Create(NzContextParameters& parameters)
@@ -74,7 +74,7 @@ bool NzContextImpl::Create(NzContextParameters& parameters)
do
{
valid = wglChoosePixelFormat(m_deviceContext, attributes, nullptr, 1, &pixelFormat, &numFormats);
valid = (wglChoosePixelFormat(m_deviceContext, attributes, nullptr, 1, &pixelFormat, &numFormats) == TRUE);
}
while ((!valid || numFormats == 0) && --attributes[19] > 0);
@@ -229,6 +229,6 @@ void NzContextImpl::SwapBuffers()
bool NzContextImpl::Desactivate()
{
return wglMakeCurrent(nullptr, nullptr);
return wglMakeCurrent(nullptr, nullptr) == TRUE;
}