@ -61,8 +61,6 @@ namespace MWGui
, mGuiMode(GM_Inventory)
, mLastXSize(0)
, mLastYSize(0)
, mResourceSystem(resourceSystem)
, mViewer(viewer)
, mPreview(new MWRender::InventoryPreview(viewer, resourceSystem, MWBase::Environment::get().getWorld()->getPlayerPtr()))
, mTrading(false)
{
@ -99,9 +99,6 @@ namespace MWGui
int mLastXSize;
int mLastYSize;
Resource::ResourceSystem* mResourceSystem;
osgViewer::Viewer* mViewer;
std::auto_ptr<MyGUI::ITexture> mPreviewTexture;
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)
: WindowModal("openmw_interactive_messagebox.layout")
, mMessageBoxManager(parMessageBoxManager)
, mTextButtonPadding(0)
, mButtonPressed(-1)
WindowModal::open();
@ -88,7 +88,6 @@ namespace MWGui
MyGUI::Widget* mButtonsWidget;
std::vector<MyGUI::Button*> mButtons;
int mTextButtonPadding;
int mButtonPressed;
};
@ -240,7 +240,7 @@ namespace MWRender
, mTextKeyListener(NULL)
for(size_t i = 0;i < sNumGroups;i++)
mAnimationTimePtr[i].reset(new AnimationTime(this));
mAnimationTimePtr[i].reset(new AnimationTime);
}
Animation::~Animation()
@ -95,13 +95,9 @@ protected:
class AnimationTime : public SceneUtil::ControllerSource
private:
Animation *mAnimation;
boost::shared_ptr<float> mTimePtr;
public:
AnimationTime(Animation *anim)
: mAnimation(anim)
{ }
void setTimePtr(boost::shared_ptr<float> time)
{ mTimePtr = time; }
@ -242,7 +242,6 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> par
mShowWeapons(false),
mShowCarriedLeft(true),
mNpcType(Type_Normal),
mVisibilityFlags(visibilityFlags),
mAlpha(1.f),
mSoundsDisabled(disableSounds),
mHeadYawRadians(0.f),
@ -90,8 +90,6 @@ private:
NpcType mNpcType;
int mVisibilityFlags;
int mPartslots[ESM::PRT_Count]; //Each part slot is taken by clothing, armor, or is empty
int mPartPriorities[ESM::PRT_Count];