mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #1262 from Allofich/warnings

Browse Source 
Fix more warnings
pull/203/head
scrawl 8 years ago committed by GitHub
parent c2240e3af1 ff3cb18d4f
commit 1956602aa2
28 changed files with 54 additions and 67 deletions
Show Stats Download Patch File Download Diff File

4
apps/openmw/mwgui/charactercreation.cpp
Unescape Escape View File

@ -246,8 +246,8 @@ namespace MWGui
mReviewDialog->setBirthSign(player.getBirthSign());
{
MWWorld::Ptr player = MWMechanics::getPlayer();
const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
MWWorld::Ptr playerPtr = MWMechanics::getPlayer();
const MWMechanics::CreatureStats& stats = playerPtr.getClass().getCreatureStats(playerPtr);
mReviewDialog->setHealth ( stats.getHealth() );
mReviewDialog->setMagicka( stats.getMagicka() );

23
apps/openmw/mwmechanics/actors.cpp
Unescape Escape View File

@ -78,7 +78,7 @@ class CheckActorCommanded : public MWMechanics::EffectSourceVisitor
MWWorld::Ptr mActor;
public:
bool mCommanded;
CheckActorCommanded(MWWorld::Ptr actor)
CheckActorCommanded(const MWWorld::Ptr& actor)
: mActor(actor)
, mCommanded(false){}
@ -114,9 +114,7 @@ void adjustCommandedActor (const MWWorld::Ptr& actor)
}
if (!check.mCommanded && hasCommandPackage)
{
stats.getAiSequence().erase(it);
}
}
void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float& magicka)
@ -151,7 +149,7 @@ namespace MWMechanics
MWWorld::Ptr mActor;
bool mTrapped;
public:
SoulTrap(MWWorld::Ptr trappedCreature)
SoulTrap(const MWWorld::Ptr& trappedCreature)
: mCreature(trappedCreature)
, mTrapped(false)
{
@ -722,16 +720,8 @@ namespace MWMechanics
// any value of calm > 0 will stop the actor from fighting
if ((effects.get(ESM::MagicEffect::CalmHumanoid).getMagnitude() > 0 && ptr.getClass().isNpc())
|| (effects.get(ESM::MagicEffect::CalmCreature).getMagnitude() > 0 && !ptr.getClass().isNpc()))
{
for (std::list<AiPackage*>::const_iterator it = creatureStats.getAiSequence().begin(); it != creatureStats.getAiSequence().end(); )
{
if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
it = creatureStats.getAiSequence().erase(it);
else
++it;
}
}
|| (effects.get(ESM::MagicEffect::CalmCreature).getMagnitude() > 0 && !ptr.getClass().isNpc()))
creatureStats.getAiSequence().stopCombat();
// Update bound effects
// Note: in vanilla MW multiple bound items of the same type can be created by different spells.
@ -820,7 +810,7 @@ namespace MWMechanics
NpcStats &stats = ptr.getClass().getNpcStats(ptr);
// When npc stats are just initialized, mTimeToStartDrowning == -1 and we should get value from GMST
static const int fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHoldBreathTime")->getFloat();
static const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fHoldBreathTime")->getFloat();
if (stats.getTimeToStartDrowning() == -1.f)
stats.setTimeToStartDrowning(fHoldBreathTime);
@ -860,10 +850,7 @@ namespace MWMechanics
}
}
else
{
static const float fHoldBreathTime = world->getStore().get<ESM::GameSetting>().find("fHoldBreathTime")->getFloat();
stats.setTimeToStartDrowning(fHoldBreathTime);
}
}
void Actors::updateEquippedLight (const MWWorld::Ptr& ptr, float duration)

8
apps/openmw/mwmechanics/aisequence.cpp
Unescape Escape View File

@ -96,16 +96,16 @@ std::list<AiPackage*>::const_iterator AiSequence::end() const
return mPackages.end();
}
std::list<AiPackage*>::const_iterator AiSequence::erase(std::list<AiPackage*>::const_iterator package)
void AiSequence::erase(std::list<AiPackage*>::const_iterator package)
{
// Not sure if manually terminated packages should trigger mDone, probably not?
for(std::list<AiPackage*>::iterator it = mPackages.begin(); it != mPackages.end(); ++it)
{
if (package == it)
{
AiPackage* packagePtr = *it;
delete packagePtr;
return mPackages.erase(it);
delete *it;
mPackages.erase(it);
return;
}
}
throw std::runtime_error("can't find package to erase");

2
apps/openmw/mwmechanics/aisequence.hpp
Unescape Escape View File

@ -64,7 +64,7 @@ namespace MWMechanics
std::list<AiPackage*>::const_iterator begin() const;
std::list<AiPackage*>::const_iterator end() const;
std::list<AiPackage*>::const_iterator erase (std::list<AiPackage*>::const_iterator package);
void erase (std::list<AiPackage*>::const_iterator package);
/// Returns currently executing AiPackage type
/** \see enum AiPackage::TypeId **/

2
apps/openmw/mwmechanics/aiwander.cpp
Unescape Escape View File

@ -893,7 +893,7 @@ namespace MWMechanics
storage.mAllowedNodes.push_back(PathFinder::MakePathgridPoint(vectorStart + delta));
}
void AiWander::SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos, AiWanderStorage& storage)
void AiWander::SetCurrentNodeToClosestAllowedNode(const osg::Vec3f& npcPos, AiWanderStorage& storage)
{
float distanceToClosestNode = std::numeric_limits<float>::max();
unsigned int index = 0;

2
apps/openmw/mwmechanics/aiwander.hpp
Unescape Escape View File

@ -122,7 +122,7 @@ namespace MWMechanics
/// convert point from local (i.e. cell) to world coordinates
void ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell);
void SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos, AiWanderStorage& storage);
void SetCurrentNodeToClosestAllowedNode(const osg::Vec3f& npcPos, AiWanderStorage& storage);
void AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex, AiWanderStorage& storage);

2
apps/openmw/mwmechanics/character.cpp
Unescape Escape View File

@ -2242,7 +2242,7 @@ void CharacterController::setAttackingOrSpell(bool attackingOrSpell)
mAttackingOrSpell = attackingOrSpell;
}
void CharacterController::setAIAttackType(std::string attackType)
void CharacterController::setAIAttackType(const std::string& attackType)
{
mAttackType = attackType;
}

2
apps/openmw/mwmechanics/character.hpp
Unescape Escape View File

@ -268,7 +268,7 @@ public:
bool isSneaking() const;
void setAttackingOrSpell(bool attackingOrSpell);
void setAIAttackType(std::string attackType); // set and used by AiCombat
void setAIAttackType(const std::string& attackType);
static void setAttackTypeRandomly(std::string& attackType);
bool readyToPrepareAttack() const;

8
apps/openmw/mwmechanics/enchanting.cpp
Unescape Escape View File

@ -21,7 +21,7 @@ namespace MWMechanics
, mSelfEnchanting(false)
{}
void Enchanting::setOldItem(MWWorld::Ptr oldItem)
void Enchanting::setOldItem(const MWWorld::Ptr& oldItem)
{
mOldItemPtr=oldItem;
if(!itemEmpty())
@ -39,7 +39,7 @@ namespace MWMechanics
mNewItemName=s;
}
void Enchanting::setEffect(ESM::EffectList effectList)
void Enchanting::setEffect(const ESM::EffectList& effectList)
{
mEffectList=effectList;
}
@ -49,7 +49,7 @@ namespace MWMechanics
return mCastStyle;
}
void Enchanting::setSoulGem(MWWorld::Ptr soulGem)
void Enchanting::setSoulGem(const MWWorld::Ptr& soulGem)
{
mSoulGemPtr=soulGem;
}
@ -269,7 +269,7 @@ namespace MWMechanics
mSelfEnchanting = selfEnchanting;
}
void Enchanting::setEnchanter(MWWorld::Ptr enchanter)
void Enchanting::setEnchanter(const MWWorld::Ptr& enchanter)
{
mEnchanter = enchanter;
}

8
apps/openmw/mwmechanics/enchanting.hpp
Unescape Escape View File

@ -29,14 +29,14 @@ namespace MWMechanics
public:
Enchanting();
void setEnchanter(MWWorld::Ptr enchanter);
void setEnchanter(const MWWorld::Ptr& enchanter);
void setSelfEnchanting(bool selfEnchanting);
void setOldItem(MWWorld::Ptr oldItem);
void setOldItem(const MWWorld::Ptr& oldItem);
MWWorld::Ptr getOldItem() { return mOldItemPtr; }
MWWorld::Ptr getGem() { return mSoulGemPtr; }
void setNewItemName(const std::string& s);
void setEffect(ESM::EffectList effectList);
void setSoulGem(MWWorld::Ptr soulGem);
void setEffect(const ESM::EffectList& effectList);
void setSoulGem(const MWWorld::Ptr& soulGem);
bool create(); //Return true if created, false if failed.
void nextCastStyle(); //Set enchant type to next possible type (for mOldItemPtr object)
int getCastStyle() const;

2
apps/openmw/mwmechanics/pathfinding.cpp
Unescape Escape View File

@ -15,7 +15,7 @@ namespace
// Chooses a reachable end pathgrid point. start is assumed reachable.
std::pair<int, bool> getClosestReachablePoint(const ESM::Pathgrid* grid,
const MWWorld::CellStore *cell,
const osg::Vec3f pos, int start)
const osg::Vec3f& pos, int start)
{
assert(grid && !grid->mPoints.empty());

6
apps/openmw/mwphysics/physicssystem.cpp
Unescape Escape View File

@ -794,7 +794,7 @@ namespace MWPhysics
btVector3 mContactPoint;
btScalar mLeastDistSqr;
DeepestNotMeContactTestResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*> targets, const btVector3 &origin)
DeepestNotMeContactTestResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3 &origin)
: mMe(me), mTargets(targets), mOrigin(origin), mObject(NULL), mContactPoint(0,0,0),
mLeastDistSqr(std::numeric_limits<float>::max())
{ }
@ -912,7 +912,7 @@ namespace MWPhysics
class ClosestNotMeRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
{
public:
ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*> targets, const btVector3& from, const btVector3& to)
ClosestNotMeRayResultCallback(const btCollisionObject* me, const std::vector<const btCollisionObject*>& targets, const btVector3& from, const btVector3& to)
: btCollisionWorld::ClosestRayResultCallback(from, to)
, mMe(me), mTargets(targets)
{
@ -938,7 +938,7 @@ namespace MWPhysics
const std::vector<const btCollisionObject*> mTargets;
};
PhysicsSystem::RayResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, MWWorld::ConstPtr ignore, std::vector<MWWorld::Ptr> targets, int mask, int group) const
PhysicsSystem::RayResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group) const
{
btVector3 btFrom = toBullet(from);
btVector3 btTo = toBullet(to);

2
apps/openmw/mwphysics/physicssystem.hpp
Unescape Escape View File

@ -114,7 +114,7 @@ namespace MWPhysics
};
/// @param me Optional, a Ptr to ignore in the list of results. targets are actors to filter for, ignoring all other actors.
RayResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, MWWorld::ConstPtr ignore = MWWorld::ConstPtr(),
RayResult castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore = MWWorld::ConstPtr(),
std::vector<MWWorld::Ptr> targets = std::vector<MWWorld::Ptr>(),
int mask = CollisionType_World|CollisionType_HeightMap|CollisionType_Actor|CollisionType_Door, int group=0xff) const;

6
apps/openmw/mwrender/animation.cpp
Unescape Escape View File

@ -282,7 +282,7 @@ namespace MWRender
class GlowUpdater : public SceneUtil::StateSetUpdater
{
public:
GlowUpdater(int texUnit, osg::Vec4f color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures,
GlowUpdater(int texUnit, const osg::Vec4f& color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures,
osg::Node* node, float duration, Resource::ResourceSystem* resourcesystem)
: mTexUnit(texUnit)
, mColor(color)
@ -383,7 +383,7 @@ namespace MWRender
return mDone;
}
void setColor(osg::Vec4f color)
void setColor(const osg::Vec4f& color)
{
mColor = color;
mColorChanged = true;
@ -1362,7 +1362,7 @@ namespace MWRender
useQuadratic, quadraticValue, quadraticRadiusMult, useLinear, linearRadiusMult, linearValue);
}
void Animation::addEffect (const std::string& model, int effectId, bool loop, const std::string& bonename, std::string texture)
void Animation::addEffect (const std::string& model, int effectId, bool loop, const std::string& bonename, const std::string& texture)
{
if (!mObjectRoot.get())
return;

2
apps/openmw/mwrender/animation.hpp
Unescape Escape View File

@ -362,7 +362,7 @@ public:
* @param texture override the texture specified in the model's materials - if empty, do not override
* @note Will not add an effect twice.
*/
void addEffect (const std::string& model, int effectId, bool loop = false, const std::string& bonename = "", std::string texture = "");
void addEffect (const std::string& model, int effectId, bool loop = false, const std::string& bonename = "", const std::string& texture = "");
void removeEffect (int effectId);
void getLoopingEffects (std::vector<int>& out) const;

4
apps/openmw/mwrender/characterpreview.cpp
Unescape Escape View File

@ -105,7 +105,7 @@ namespace MWRender
};
CharacterPreview::CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem,
MWWorld::Ptr character, int sizeX, int sizeY, const osg::Vec3f& position, const osg::Vec3f& lookAt)
const MWWorld::Ptr& character, int sizeX, int sizeY, const osg::Vec3f& position, const osg::Vec3f& lookAt)
: mParent(parent)
, mResourceSystem(resourceSystem)
, mPosition(position)
@ -244,7 +244,7 @@ namespace MWRender
// --------------------------------------------------------------------------------------------------
InventoryPreview::InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character)
InventoryPreview::InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character)
: CharacterPreview(parent, resourceSystem, character, 512, 1024, osg::Vec3f(0, 700, 71), osg::Vec3f(0,0,71))
{
}

4
apps/openmw/mwrender/characterpreview.hpp
Unescape Escape View File

@ -28,7 +28,7 @@ namespace MWRender
class CharacterPreview
{
public:
CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character, int sizeX, int sizeY,
CharacterPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character, int sizeX, int sizeY,
const osg::Vec3f& position, const osg::Vec3f& lookAt);
virtual ~CharacterPreview();
@ -73,7 +73,7 @@ namespace MWRender
{
public:
InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, MWWorld::Ptr character);
InventoryPreview(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Ptr& character);
void updatePtr(const MWWorld::Ptr& ptr);

6
apps/openmw/mwrender/npcanimation.cpp
Unescape Escape View File

@ -99,7 +99,7 @@ private:
private:
void resetBlinkTimer();
public:
HeadAnimationTime(MWWorld::Ptr reference);
HeadAnimationTime(const MWWorld::Ptr& reference);
void updatePtr(const MWWorld::Ptr& updated);
@ -128,7 +128,7 @@ public:
{
}
void setOffset(osg::Vec3f offset)
void setOffset(const osg::Vec3f& offset)
{
mOffset = offset;
}
@ -155,7 +155,7 @@ private:
// --------------------------------------------------------------------------------------------------------------
HeadAnimationTime::HeadAnimationTime(MWWorld::Ptr reference)
HeadAnimationTime::HeadAnimationTime(const MWWorld::Ptr& reference)
: mReference(reference), mTalkStart(0), mTalkStop(0), mBlinkStart(0), mBlinkStop(0), mEnabled(true), mValue(0)
{
resetBlinkTimer();

2
apps/openmw/mwrender/objects.hpp
Unescape Escape View File

@ -37,7 +37,7 @@ class Animation;
class PtrHolder : public osg::Object
{
public:
PtrHolder(MWWorld::Ptr ptr)
PtrHolder(const MWWorld::Ptr& ptr)
: mPtr(ptr)
{
}

2
apps/openmw/mwrender/util.cpp
Unescape Escape View File

@ -14,7 +14,7 @@ namespace MWRender
class TextureOverrideVisitor : public osg::NodeVisitor
{
public:
TextureOverrideVisitor(std::string texture, Resource::ResourceSystem* resourcesystem)
TextureOverrideVisitor(const std::string& texture, Resource::ResourceSystem* resourcesystem)
: osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
, mTexture(texture)
, mResourcesystem(resourcesystem)

2
apps/openmw/mwscript/interpretercontext.cpp
Unescape Escape View File

@ -137,7 +137,7 @@ namespace MWScript
InterpreterContext::InterpreterContext (
MWScript::Locals *locals, MWWorld::Ptr reference, const std::string& targetId)
MWScript::Locals *locals, const MWWorld::Ptr& reference, const std::string& targetId)
: mLocals (locals), mReference (reference), mTargetId (targetId)
{
// If we run on a reference (local script, dialogue script or console with object

2
apps/openmw/mwscript/interpretercontext.hpp
Unescape Escape View File

@ -51,7 +51,7 @@ namespace MWScript
public:
InterpreterContext (MWScript::Locals *locals, MWWorld::Ptr reference,
InterpreterContext (MWScript::Locals *locals, const MWWorld::Ptr& reference,
const std::string& targetId = "");
///< The ownership of \a locals is not transferred. 0-pointer allowed.

2
apps/openmw/mwworld/player.cpp
Unescape Escape View File

@ -255,7 +255,7 @@ namespace MWWorld
return MWBase::Environment::get().getMechanicsManager()->getEnemiesNearby(getPlayer()).size() != 0;
}
void Player::markPosition(CellStore *markedCell, ESM::Position markedPosition)
void Player::markPosition(CellStore *markedCell, const ESM::Position& markedPosition)
{
mMarkedCell = markedCell;
mMarkedPosition = markedPosition;

2
apps/openmw/mwworld/player.hpp
Unescape Escape View File

@ -61,7 +61,7 @@ namespace MWWorld
void setWerewolfSkillsAttributes();
// For mark/recall magic effects
void markPosition (CellStore* markedCell, ESM::Position markedPosition);
void markPosition (CellStore* markedCell, const ESM::Position& markedPosition);
void getMarkedPosition (CellStore*& markedCell, ESM::Position& markedPosition) const;
/// Interiors can not always be mapped to a world position. However

2
apps/openmw/mwworld/worldimp.cpp
Unescape Escape View File

@ -2989,7 +2989,7 @@ namespace MWWorld
struct AddDetectedReferenceVisitor
{
AddDetectedReferenceVisitor(std::vector<Ptr>& out, Ptr detector, World::DetectionType type, float squaredDist)
AddDetectedReferenceVisitor(std::vector<Ptr>& out, const Ptr& detector, World::DetectionType type, float squaredDist)
: mOut(out), mDetector(detector), mSquaredDist(squaredDist), mType(type)
{
}

2
components/esm/esmwriter.hpp
Unescape Escape View File

@ -86,7 +86,7 @@ private:
// Prevent using writeHNT with strings. This already happened by accident and results in
// state being discarded without any error on writing or reading it. :(
// writeHNString and friends must be used instead.
void writeHNT(const std::string &name, std::string data)
void writeHNT(const std::string& name, const std::string& data)
{
}
void writeT(const std::string& data)

6
components/nifosg/controller.cpp
Unescape Escape View File

@ -218,7 +218,7 @@ UVController::UVController()
{
}
UVController::UVController(const Nif::NiUVData *data, std::set<int> textureUnits)
UVController::UVController(const Nif::NiUVData *data, const std::set<int>& textureUnits)
: mUTrans(data->mKeyList[0], 0.f)
, mVTrans(data->mKeyList[1], 0.f)
, mUScale(data->mKeyList[2], 1.f)
@ -381,14 +381,14 @@ void MaterialColorController::apply(osg::StateSet *stateset, osg::NodeVisitor *n
}
}
FlipController::FlipController(const Nif::NiFlipController *ctrl, std::vector<osg::ref_ptr<osg::Texture2D> > textures)
FlipController::FlipController(const Nif::NiFlipController *ctrl, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures)
: mTexSlot(ctrl->mTexSlot)
, mDelta(ctrl->mDelta)
, mTextures(textures)
{
}
FlipController::FlipController(int texSlot, float delta, std::vector<osg::ref_ptr<osg::Texture2D> > textures)
FlipController::FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures)
: mTexSlot(texSlot)
, mDelta(delta)
, mTextures(textures)

6
components/nifosg/controller.hpp
Unescape Escape View File

@ -223,7 +223,7 @@ namespace NifOsg
public:
UVController();
UVController(const UVController&,const osg::CopyOp&);
UVController(const Nif::NiUVData *data, std::set<int> textureUnits);
UVController(const Nif::NiUVData *data, const std::set<int>& textureUnits);
META_Object(NifOsg,UVController)
@ -297,8 +297,8 @@ namespace NifOsg
std::vector<osg::ref_ptr<osg::Texture2D> > mTextures;
public:
FlipController(const Nif::NiFlipController* ctrl, std::vector<osg::ref_ptr<osg::Texture2D> > textures);
FlipController(int texSlot, float delta, std::vector<osg::ref_ptr<osg::Texture2D> > textures);
FlipController(const Nif::NiFlipController* ctrl, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures);
FlipController(int texSlot, float delta, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures);
FlipController();
FlipController(const FlipController& copy, const osg::CopyOp& copyop);

Write Preview
Loading…
Cancel
Save