aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Models/ModelInstance.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-08-21 16:56:11 +0200
committerjackpoz <giacomopoz@gmail.com>2014-08-23 19:56:41 +0200
commit7fe7f30521503559dc8aee9f3127e11111f8ccc4 (patch)
treef4a75f563e89957d43cef93253bfc300ecf57339 /src/server/collision/Models/ModelInstance.cpp
parentf5f9df0483fbf847eb9ee4e6ec4ecc6cf66d3a47 (diff)
Core/Misc: Fix some -Wconversion warnings
Diffstat (limited to 'src/server/collision/Models/ModelInstance.cpp')
-rw-r--r--src/server/collision/Models/ModelInstance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp
index 475984c4fd3..bd84548d792 100644
--- a/src/server/collision/Models/ModelInstance.cpp
+++ b/src/server/collision/Models/ModelInstance.cpp
@@ -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";