From 35f7216f2f52b4b21e89ecdf974f731ca18add84 Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 14 Sep 2012 17:25:32 +0200 Subject: [PATCH] fixed some things --- apps/openmw/mwgui/inventorywindow.cpp | 3 ++- apps/openmw/mwrender/npcanimation.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index dffd14d171..66a8efe5d3 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -92,6 +92,7 @@ namespace MWGui mBoughtItems.clear(); onWindowResize(static_cast(mMainWidget)); + drawItems(); } void InventoryWindow::onWindowResize(MyGUI::Window* _sender) @@ -293,7 +294,7 @@ namespace MWGui MyGUI::IntSize size = mAvatar->getSize(); MWBase::Environment::get().getWorld()->updateCharacterPreview (size.width, size.height); - mAvatarImage->setSize(MyGUI::IntSize(512, 1024)); + mAvatarImage->setSize(MyGUI::IntSize(std::max(mAvatar->getSize().width, 512), std::max(mAvatar->getSize().height, 1024))); mAvatarImage->setImageTexture("CharacterPreview"); } diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index c039b8d446..c386193c80 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -368,7 +368,7 @@ NifOgre::EntityList NpcAnimation::insertBoundedPart(const std::string &mesh, int void NpcAnimation::runAnimation(float timepassed) { - //if(timeToChange > .2) + if(timeToChange > .2) { timeToChange = 0; updateParts();