mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 22:15:32 +00:00
Code Issues Releases Wiki Activity

Clang warning fixes (thanks hemite)

Browse source
This commit is contained in:
scrawl 2015-01-27 01:40:36 +01:00
parent cfdbe35b0f
commit f35c9b7a69
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/essimporter/converter.hpp
View file

@ -209,7 +209,7 @@ public:
else else
{ {
int index = npcc.mNPDT.mIndex; int index = npcc.mNPDT.mIndex;
mContext->mNpcChanges.insert(std::make_pair(std::make_pair(index,id), npcc)).second; mContext->mNpcChanges.insert(std::make_pair(std::make_pair(index,id), npcc));
} }
} }
}; };

4
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -58,7 +58,7 @@ namespace
// magnitude of pits/obstacles is defined by PATHFIND_Z_REACH // magnitude of pits/obstacles is defined by PATHFIND_Z_REACH
bool checkWayIsClear(const Ogre::Vector3& from, const Ogre::Vector3& to, float offsetXY) bool checkWayIsClear(const Ogre::Vector3& from, const Ogre::Vector3& to, float offsetXY)
{ {
if((to - from).length() >= PATHFIND_CAUTION_DIST || abs(from.z - to.z) <= PATHFIND_Z_REACH) if((to - from).length() >= PATHFIND_CAUTION_DIST || std::abs(from.z - to.z) <= PATHFIND_Z_REACH)
{ {
Ogre::Vector3 dir = to - from; Ogre::Vector3 dir = to - from;
dir.z = 0; dir.z = 0;
@ -69,7 +69,7 @@ namespace
// cast up-down ray and find height in world space of hit // cast up-down ray and find height in world space of hit
float h = _from.z - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(_from, -Ogre::Vector3::UNIT_Z, verticalOffset + PATHFIND_Z_REACH + 1); float h = _from.z - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(_from, -Ogre::Vector3::UNIT_Z, verticalOffset + PATHFIND_Z_REACH + 1);
if(abs(from.z - h) <= PATHFIND_Z_REACH) if(std::abs(from.z - h) <= PATHFIND_Z_REACH)
return true; return true;
} }

2
apps/openmw/mwmechanics/character.cpp
View file

@ -1372,7 +1372,7 @@ void CharacterController::update(float duration)
//Force Jump Logic //Force Jump Logic
bool isMoving = (std::abs(cls.getMovementSettings(mPtr).mPosition[0]) > .5 || abs(cls.getMovementSettings(mPtr).mPosition[1]) > .5); bool isMoving = (std::abs(cls.getMovementSettings(mPtr).mPosition[0]) > .5 || std::abs(cls.getMovementSettings(mPtr).mPosition[1]) > .5);
if(!inwater && !flying) if(!inwater && !flying)
{ {
//Force Jump //Force Jump

4
apps/openmw/mwmechanics/obstacle.cpp
View file

@ -115,8 +115,8 @@ namespace MWMechanics
if(mDistSameSpot == -1) if(mDistSameSpot == -1)
mDistSameSpot = DIST_SAME_SPOT * (cls.getSpeed(actor) / 150); mDistSameSpot = DIST_SAME_SPOT * (cls.getSpeed(actor) / 150);
bool samePosition = (abs(pos.pos[0] - mPrevX) < mDistSameSpot) && bool samePosition = (std::abs(pos.pos[0] - mPrevX) < mDistSameSpot) &&
(abs(pos.pos[1] - mPrevY) < mDistSameSpot); (std::abs(pos.pos[1] - mPrevY) < mDistSameSpot);
// update position // update position
mPrevX = pos.pos[0]; mPrevX = pos.pos[0];
mPrevY = pos.pos[1]; mPrevY = pos.pos[1];