Fixed missing includes and warnings under VS

Former-commit-id: c06756b62b616e7322aced01062966247bb7654f
This commit is contained in:
Lynix
2015-02-21 15:04:07 +01:00
parent ca88c5bae4
commit ee6ca790a5
23 changed files with 68 additions and 58 deletions

View File

@@ -91,7 +91,7 @@ bool NzParameterList::GetFloatParameter(const NzString& name, float* value) cons
return true;
case nzParameterType_Integer:
*value = it->second.value.intVal;
*value = static_cast<float>(it->second.value.intVal);
return true;
case nzParameterType_String:
@@ -99,7 +99,7 @@ bool NzParameterList::GetFloatParameter(const NzString& name, float* value) cons
double converted;
if (it->second.value.stringVal.ToDouble(&converted))
{
*value = converted;
*value = static_cast<float>(converted);
return true;
}
@@ -133,7 +133,7 @@ bool NzParameterList::GetIntegerParameter(const NzString& name, int* value) cons
return true;
case nzParameterType_Float:
*value = it->second.value.floatVal;
*value = static_cast<int>(it->second.value.floatVal);
return true;
case nzParameterType_Integer:
@@ -147,7 +147,7 @@ bool NzParameterList::GetIntegerParameter(const NzString& name, int* value) cons
{
if (converted <= std::numeric_limits<int>::max() && converted >= std::numeric_limits<int>::min())
{
*value = converted;
*value = static_cast<int>(converted);
return true;
}
}