mirror of
https://github.com/OpenMW/openmw.git
synced 2025-05-30 19:11:33 +00:00
Fix -Wunused-private-field clang warnings
This commit is contained in:
parent
e23775e338
commit
30ab15e605
8 changed files with 1 additions and 15 deletions
|
@ -61,8 +61,6 @@ namespace MWGui
|
||||||
, mGuiMode(GM_Inventory)
|
, mGuiMode(GM_Inventory)
|
||||||
, mLastXSize(0)
|
, mLastXSize(0)
|
||||||
, mLastYSize(0)
|
, mLastYSize(0)
|
||||||
, mResourceSystem(resourceSystem)
|
|
||||||
, mViewer(viewer)
|
|
||||||
, mPreview(new MWRender::InventoryPreview(viewer, resourceSystem, MWBase::Environment::get().getWorld()->getPlayerPtr()))
|
, mPreview(new MWRender::InventoryPreview(viewer, resourceSystem, MWBase::Environment::get().getWorld()->getPlayerPtr()))
|
||||||
, mTrading(false)
|
, mTrading(false)
|
||||||
{
|
{
|
||||||
|
|
|
@ -99,9 +99,6 @@ namespace MWGui
|
||||||
int mLastXSize;
|
int mLastXSize;
|
||||||
int mLastYSize;
|
int mLastYSize;
|
||||||
|
|
||||||
Resource::ResourceSystem* mResourceSystem;
|
|
||||||
osgViewer::Viewer* mViewer;
|
|
||||||
|
|
||||||
std::auto_ptr<MyGUI::ITexture> mPreviewTexture;
|
std::auto_ptr<MyGUI::ITexture> mPreviewTexture;
|
||||||
std::auto_ptr<MWRender::InventoryPreview> mPreview;
|
std::auto_ptr<MWRender::InventoryPreview> mPreview;
|
||||||
|
|
||||||
|
|
|
@ -195,7 +195,6 @@ namespace MWGui
|
||||||
InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
|
InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
|
||||||
: WindowModal("openmw_interactive_messagebox.layout")
|
: WindowModal("openmw_interactive_messagebox.layout")
|
||||||
, mMessageBoxManager(parMessageBoxManager)
|
, mMessageBoxManager(parMessageBoxManager)
|
||||||
, mTextButtonPadding(0)
|
|
||||||
, mButtonPressed(-1)
|
, mButtonPressed(-1)
|
||||||
{
|
{
|
||||||
WindowModal::open();
|
WindowModal::open();
|
||||||
|
|
|
@ -88,7 +88,6 @@ namespace MWGui
|
||||||
MyGUI::Widget* mButtonsWidget;
|
MyGUI::Widget* mButtonsWidget;
|
||||||
std::vector<MyGUI::Button*> mButtons;
|
std::vector<MyGUI::Button*> mButtons;
|
||||||
|
|
||||||
int mTextButtonPadding;
|
|
||||||
int mButtonPressed;
|
int mButtonPressed;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -240,7 +240,7 @@ namespace MWRender
|
||||||
, mTextKeyListener(NULL)
|
, mTextKeyListener(NULL)
|
||||||
{
|
{
|
||||||
for(size_t i = 0;i < sNumGroups;i++)
|
for(size_t i = 0;i < sNumGroups;i++)
|
||||||
mAnimationTimePtr[i].reset(new AnimationTime(this));
|
mAnimationTimePtr[i].reset(new AnimationTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
Animation::~Animation()
|
Animation::~Animation()
|
||||||
|
|
|
@ -95,13 +95,9 @@ protected:
|
||||||
class AnimationTime : public SceneUtil::ControllerSource
|
class AnimationTime : public SceneUtil::ControllerSource
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
Animation *mAnimation;
|
|
||||||
boost::shared_ptr<float> mTimePtr;
|
boost::shared_ptr<float> mTimePtr;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AnimationTime(Animation *anim)
|
|
||||||
: mAnimation(anim)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
void setTimePtr(boost::shared_ptr<float> time)
|
void setTimePtr(boost::shared_ptr<float> time)
|
||||||
{ mTimePtr = time; }
|
{ mTimePtr = time; }
|
||||||
|
|
|
@ -242,7 +242,6 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> par
|
||||||
mShowWeapons(false),
|
mShowWeapons(false),
|
||||||
mShowCarriedLeft(true),
|
mShowCarriedLeft(true),
|
||||||
mNpcType(Type_Normal),
|
mNpcType(Type_Normal),
|
||||||
mVisibilityFlags(visibilityFlags),
|
|
||||||
mAlpha(1.f),
|
mAlpha(1.f),
|
||||||
mSoundsDisabled(disableSounds),
|
mSoundsDisabled(disableSounds),
|
||||||
mHeadYawRadians(0.f),
|
mHeadYawRadians(0.f),
|
||||||
|
|
|
@ -90,8 +90,6 @@ private:
|
||||||
};
|
};
|
||||||
NpcType mNpcType;
|
NpcType mNpcType;
|
||||||
|
|
||||||
int mVisibilityFlags;
|
|
||||||
|
|
||||||
int mPartslots[ESM::PRT_Count]; //Each part slot is taken by clothing, armor, or is empty
|
int mPartslots[ESM::PRT_Count]; //Each part slot is taken by clothing, armor, or is empty
|
||||||
int mPartPriorities[ESM::PRT_Count];
|
int mPartPriorities[ESM::PRT_Count];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue