Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fix some -Wconversion warnings

Browse Source
This commit is contained in:
jackpoz
2014-08-21 16:56:11 +02:00
parent f5f9df0483
commit 7fe7f30521
85 changed files with 207 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/collision/Models/ModelInstance.cpp
View File

@@ -28,7 +28,7 @@ namespace VMAP
{
ModelInstance::ModelInstance(const ModelSpawn &spawn, WorldModel* model): ModelSpawn(spawn), iModel(model)
{
iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iRot.y/180.f, G3D::pi()*iRot.x/180.f, G3D::pi()*iRot.z/180.f).inverse();
iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pif()*iRot.y/180.f, G3D::pif()*iRot.x/180.f, G3D::pif()*iRot.z/180.f).inverse();
iInvScale = 1.f/iScale;
}
@@ -40,7 +40,7 @@ namespace VMAP
return false;
}
float time = pRay.intersectionTime(iBound);
if (time == G3D::inf())
if (time == G3D::finf())
{
// std::cout << "Ray does not hit '" << name << "'\n";