Merge remote-tracking branch 'zini/master' into nifogre

apps/esmtool/record.cpp

@@ -439,7 +439,7 @@ void Record<ESM::Apparatus>::print()
 template<>
 void Record<ESM::BodyPart>::print()
 {
-    std::cout << "  Name: " << mData.mName << std::endl;
+    std::cout << "  Race: " << mData.mRace << std::endl;
     std::cout << "  Model: " << mData.mModel << std::endl;
     std::cout << "  Type: " << meshTypeLabel(mData.mData.mType)
               << " (" << (int)mData.mData.mType << ")" << std::endl;

apps/launcher/CMakeLists.txt

@@ -102,3 +102,9 @@ if (BUILD_WITH_CODE_COVERAGE)
   add_definitions (--coverage)
   target_link_libraries(omwlauncher gcov)
 endif()
+
+# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
+if (UNIX AND NOT APPLE)
+target_link_libraries(omwlauncher dl Xt)
+endif()
+

apps/openmw/CMakeLists.txt

@@ -122,6 +122,12 @@ if (UNIX AND NOT APPLE)
 target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
+# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
+if (UNIX AND NOT APPLE)
+target_link_libraries(openmw dl Xt)
+endif()
+
+
 if(APPLE)
     find_library(CARBON_FRAMEWORK Carbon)
     find_library(COCOA_FRAMEWORK Cocoa)

apps/openmw/mwgui/alchemywindow.cpp

@@ -8,8 +8,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/containerstore.hpp"
 
 namespace
 {

apps/openmw/mwgui/alchemywindow.hpp

@@ -10,7 +10,6 @@
 
 namespace MWGui
 {
-
     class AlchemyWindow : public WindowBase, public ContainerBase
     {
     public:

apps/openmw/mwgui/birth.cpp

@@ -3,8 +3,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/charactercreation.cpp

@@ -5,8 +5,6 @@
 #include "class.hpp"
 #include "birth.hpp"
 #include "review.hpp"
-#include "dialogue.hpp"
-#include "mode.hpp"
 #include "inventorywindow.hpp"
 #include <boost/lexical_cast.hpp>
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/class.cpp

@@ -1,11 +1,6 @@
 #include "class.hpp"
 
-#include <iterator>
-
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/companionwindow.cpp

@@ -2,7 +2,6 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 

apps/openmw/mwgui/confirmationdialog.cpp

@@ -1,10 +1,5 @@
 #include "confirmationdialog.hpp"
 
-#include <boost/lexical_cast.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWGui
 {
     ConfirmationDialog::ConfirmationDialog() :

apps/openmw/mwgui/console.cpp

@@ -1,13 +1,7 @@
-
 #include "console.hpp"
 
-#include <algorithm>
-#include <fstream>
-
 #include <components/compiler/exception.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwscript/extensions.hpp"
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/container.cpp

@@ -1,11 +1,5 @@
 #include "container.hpp"
 
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <cassert>
-#include <iostream>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -13,15 +7,9 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwclass/container.hpp"
-
-#include "widgets.hpp"
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
 #include "inventorywindow.hpp"

apps/openmw/mwgui/countdialog.cpp

@@ -2,9 +2,6 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWGui
 {
     CountDialog::CountDialog() :

apps/openmw/mwgui/cursor.cpp

@@ -2,13 +2,11 @@
 
 #include <MyGUI_PointerManager.h>
 #include <MyGUI_InputManager.h>
-#include <MyGUI_RenderManager.h>
 #include <MyGUI_RotatingSkin.h>
 #include <MyGUI_Gui.h>
 
 #include <OgreMath.h>
 
-
 namespace MWGui
 {
 

apps/openmw/mwgui/dialogue.cpp

@@ -1,18 +1,11 @@
 #include "dialogue.hpp"
 
-#include <iostream>
-#include <iterator>
-
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
-#include "../mwbase/dialoguemanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 

apps/openmw/mwgui/formatting.cpp

@@ -3,7 +3,6 @@
 #include <components/interpreter/defines.hpp>
 
 #include "../mwscript/interpretercontext.hpp"
-#include "../mwworld/ptr.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/predicate.hpp>

apps/openmw/mwgui/hud.cpp

@@ -1,24 +1,14 @@
 #include "hud.hpp"
 
-#include <cmath>
-
-#include <MyGUI_Widget.h>
-#include <MyGUI_RenderManager.h>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwgui/widgets.hpp"
-
 #include "inventorywindow.hpp"
-#include "container.hpp"
 #include "console.hpp"
 #include "spellicons.hpp"
 

apps/openmw/mwgui/inventorywindow.cpp

@@ -1,28 +1,15 @@
 #include "inventorywindow.hpp"
 
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <cassert>
-
 #include <boost/lexical_cast.hpp>
 
-#include <components/compiler/locals.hpp>
-
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "widgets.hpp"
 #include "bookwindow.hpp"
 #include "scrollwindow.hpp"
 #include "spellwindow.hpp"

apps/openmw/mwgui/journalwindow.cpp

@@ -4,9 +4,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/journal.hpp"
 #include "../mwbase/soundmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
-
-#include "../mwdialogue/journalentry.hpp"
 
 namespace
 {

apps/openmw/mwgui/levelupdialog.cpp

@@ -8,12 +8,10 @@
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/fallback.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/stat.hpp"
 
 namespace MWGui
 {

apps/openmw/mwgui/loadingscreen.cpp

@@ -1,25 +1,16 @@
 #include "loadingscreen.hpp"
 
 #include <OgreRenderWindow.h>
-#include <OgreRoot.h>
 #include <OgreCompositorManager.h>
 #include <OgreCompositorChain.h>
-#include <OgreMaterial.h>
-
-
-#include <boost/algorithm/string.hpp>
 
 #include <openengine/ogre/fader.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/inputmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 
-#include <components/esm/records.hpp>
-
-
 namespace MWGui
 {
 

apps/openmw/mwgui/mainmenu.cpp

@@ -3,7 +3,6 @@
 #include <OgreRoot.h>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 

apps/openmw/mwgui/mapwindow.cpp

@@ -2,12 +2,8 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <OgreVector2.h>
-#include <OgreTextureManager.h>
 #include <OgreSceneNode.h>
 
-#include <MyGUI_Gui.h>
-
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/merchantrepair.cpp

@@ -9,10 +9,7 @@
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/class.hpp"
 
-#include "list.hpp"
 #include "inventorywindow.hpp"
 #include "tradewindow.hpp"
 

apps/openmw/mwgui/quickkeysmenu.cpp

@@ -2,13 +2,9 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellsuccess.hpp"
 #include "../mwgui/inventorywindow.hpp"
 #include "../mwgui/bookwindow.hpp"

apps/openmw/mwgui/race.cpp

@@ -1,19 +1,13 @@
 #include "race.hpp"
 
-#include <iostream>
-#include <iterator>
-
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "widgets.hpp"
 #include "tooltips.hpp"
 
 using namespace MWGui;
@@ -30,36 +24,6 @@ int wrap(int index, int max)
     else
         return index;
 }
-
-int countParts(const std::string &part, const std::string &race, bool male)
-{
-    /// \todo loop through the whole store for appropriate bodyparts instead of looking for fixed IDs
-    const MWWorld::Store<ESM::BodyPart> &store =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>();
-
-    std::string prefix =
-        "b_n_" + race + ((male) ? "_m_" : "_f_") + part;
-
-    std::string suffix;
-    suffix.reserve(prefix.size() + 3);
-
-    int count = -1;
-    do {
-        ++count;
-        suffix = "_" + (boost::format("%02d") % (count + 1)).str();
-    }
-    while (store.search(prefix + suffix) != 0);
-
-    if (count == 0 && part == "hair") {
-        count = -1;
-        do {
-            ++count;
-            suffix = (boost::format("%02d") % (count + 1)).str();
-        }
-        while (store.search(prefix + suffix) != 0);
-    }
-    return count;
-}
 }
 
 RaceDialog::RaceDialog()
@@ -67,8 +31,6 @@ RaceDialog::RaceDialog()
   , mGenderIndex(0)
   , mFaceIndex(0)
   , mHairIndex(0)
-  , mFaceCount(10)
-  , mHairCount(14)
   , mCurrentAngle(0)
 {
     // Centre dialog
@@ -233,67 +195,28 @@ void RaceDialog::onSelectNextGender(MyGUI::Widget*)
 
 void RaceDialog::onSelectPreviousFace(MyGUI::Widget*)
 {
-    do
+    mFaceIndex = wrap(mFaceIndex - 1, mAvailableHeads.size());
-        mFaceIndex = wrap(mFaceIndex - 1, mFaceCount);
-    while (!isFacePlayable());
     updatePreview();
 }
 
 void RaceDialog::onSelectNextFace(MyGUI::Widget*)
 {
-    do
+    mFaceIndex = wrap(mFaceIndex + 1, mAvailableHeads.size());
-        mFaceIndex = wrap(mFaceIndex + 1, mFaceCount);
-    while (!isFacePlayable());
     updatePreview();
 }
 
 void RaceDialog::onSelectPreviousHair(MyGUI::Widget*)
 {
-    do
+    mHairIndex = wrap(mHairIndex - 1, mAvailableHairs.size());
-        mHairIndex = wrap(mHairIndex - 1, mHairCount);
-    while (!isHairPlayable());
     updatePreview();
 }
 
 void RaceDialog::onSelectNextHair(MyGUI::Widget*)
 {
-    do
+    mHairIndex = wrap(mHairIndex + 1, mAvailableHairs.size());
-        mHairIndex = wrap(mHairIndex + 1, mHairCount);
-    while (!isHairPlayable());
     updatePreview();
 }
 
-bool RaceDialog::isFacePlayable()
-{
-    std::string prefix =
-            "b_n_" + mCurrentRaceId + ((mGenderIndex == 0) ? "_m_" : "_f_");
-
-    std::string headIndex = (boost::format("%02d") % (mFaceIndex + 1)).str();
-
-    const MWWorld::Store<ESM::BodyPart> &parts =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>();
-
-    if (parts.search(prefix + "head_" + headIndex) == 0)
-        return !(parts.find(prefix + "head" + headIndex)->mData.mFlags & ESM::BodyPart::BPF_NotPlayable);
-    else
-        return !(parts.find(prefix + "head_" + headIndex)->mData.mFlags & ESM::BodyPart::BPF_NotPlayable);
-}
-
-bool RaceDialog::isHairPlayable()
-{
-    std::string prefix =
-        "b_n_" + mCurrentRaceId + ((mGenderIndex == 0) ? "_m_" : "_f_");
-
-    std::string hairIndex = (boost::format("%02d") % (mHairIndex + 1)).str();
-
-    const MWWorld::Store<ESM::BodyPart> &parts =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>();
-    if (parts.search(prefix + "hair_" + hairIndex) == 0)
-        return !(parts.find(prefix + "hair" + hairIndex)->mData.mFlags & ESM::BodyPart::BPF_NotPlayable);
-    else
-        return !(parts.find(prefix + "hair_" + hairIndex)->mData.mFlags & ESM::BodyPart::BPF_NotPlayable);
-}
-
 void RaceDialog::onSelectRace(MyGUI::ListBox* _sender, size_t _index)
 {
     if (_index == MyGUI::ITEM_NONE)
@@ -314,18 +237,41 @@ void RaceDialog::onSelectRace(MyGUI::ListBox* _sender, size_t _index)
     updateSpellPowers();
 }
 
+void RaceDialog::getBodyParts (int part, std::vector<std::string>& out)
+{
+    out.clear();
+    const MWWorld::Store<ESM::BodyPart> &store =
+        MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>();
+
+    for (MWWorld::Store<ESM::BodyPart>::iterator it = store.begin(); it != store.end(); ++it)
+    {
+        const ESM::BodyPart& bodypart = *it;
+        if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
+            continue;
+        if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
+            continue;
+        if (bodypart.mData.mPart != static_cast<ESM::BodyPart::MeshPart>(part))
+            continue;
+        if (mGenderIndex != (bodypart.mData.mFlags & ESM::BodyPart::BPF_Female))
+            continue;
+        bool firstPerson = (bodypart.mId.size() >= 3)
+                && bodypart.mId[bodypart.mId.size()-3] == '1'
+                && bodypart.mId[bodypart.mId.size()-2] == 's'
+                && bodypart.mId[bodypart.mId.size()-1] == 't';
+        if (firstPerson)
+            continue;
+        if (Misc::StringUtils::ciEqual(bodypart.mRace, mCurrentRaceId))
+            out.push_back(bodypart.mId);
+    }
+}
+
 void RaceDialog::recountParts()
 {
-    mFaceCount = countParts("head", mCurrentRaceId, mGenderIndex == 0);
+    getBodyParts(ESM::BodyPart::MP_Hair, mAvailableHairs);
-    mHairCount = countParts("hair", mCurrentRaceId, mGenderIndex == 0);
+    getBodyParts(ESM::BodyPart::MP_Head, mAvailableHeads);
 
     mFaceIndex = 0;
     mHairIndex = 0;
-
-    while (!isHairPlayable())
-        mHairIndex = wrap(mHairIndex + 1, mHairCount);
-    while (!isFacePlayable())
-        mFaceIndex = wrap(mFaceIndex + 1, mFaceCount);
 }
 
 // update widget content
@@ -336,21 +282,9 @@ void RaceDialog::updatePreview()
     record.mRace = mCurrentRaceId;
     record.setIsMale(mGenderIndex == 0);
 
-    std::string prefix =
+    record.mHead = mAvailableHeads[mFaceIndex];
-        "b_n_" + mCurrentRaceId + ((record.isMale()) ? "_m_" : "_f_");
+    record.mHair = mAvailableHairs[mHairIndex];
 
-    std::string headIndex = (boost::format("%02d") % (mFaceIndex + 1)).str();
-    std::string hairIndex = (boost::format("%02d") % (mHairIndex + 1)).str();
-
-    record.mHead = prefix + "head_" + headIndex;
-    record.mHair = prefix + "hair_" + hairIndex;
-
-    const MWWorld::Store<ESM::BodyPart> &parts =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>();
-
-    if (parts.search(record.mHair) == 0) {
-        record.mHair = prefix + "hair" + hairIndex;
-    }
     mPreview->setPrototype(record);
 }
 

apps/openmw/mwgui/race.hpp

@@ -76,8 +76,10 @@ namespace MWGui
         void updatePreview();
         void recountParts();
 
-        bool isHairPlayable();
+        void getBodyParts (int part, std::vector<std::string>& out);
-        bool isFacePlayable();
+
+        std::vector<std::string> mAvailableHeads;
+        std::vector<std::string> mAvailableHairs;
 
         MyGUI::ImageBox*  mPreviewImage;
         MyGUI::ListBox*   mRaceList;
@@ -90,7 +92,6 @@ namespace MWGui
         std::vector<MyGUI::Widget*> mSpellPowerItems;
 
         int mGenderIndex, mFaceIndex, mHairIndex;
-        int mFaceCount, mHairCount;
 
         std::string mCurrentRaceId;
 

apps/openmw/mwgui/review.cpp

@@ -1,17 +1,11 @@
 #include "review.hpp"
 
-#include <cmath>
-
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "widgets.hpp"
 #include "tooltips.hpp"
 
 #undef min

apps/openmw/mwgui/settingswindow.cpp

@@ -1,24 +1,18 @@
 #include "settingswindow.hpp"
 
 #include <OgreRoot.h>
-#include <OgreRenderSystem.h>
 #include <OgrePlugin.h>
-#include <OgreString.h>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/math/common_factor_rt.hpp>
 
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwrender/renderingmanager.hpp"
-
 #include "confirmationdialog.hpp"
 
 namespace

apps/openmw/mwgui/soulgemdialog.cpp

@@ -1,6 +1,5 @@
 #include "soulgemdialog.hpp"
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 
 #include "messagebox.hpp"

apps/openmw/mwgui/spellbuyingwindow.cpp

@@ -1,7 +1,5 @@
 #include "spellbuyingwindow.hpp"
 
-#include <algorithm>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -11,9 +9,7 @@
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
 
-#include "../mwmechanics/spells.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
 #include "inventorywindow.hpp"

apps/openmw/mwgui/spellcreationdialog.cpp

@@ -4,22 +4,14 @@
 
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/class.hpp"
 
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellsuccess.hpp"
 
-
 #include "tooltips.hpp"
-#include "widgets.hpp"
 #include "class.hpp"
 #include "inventorywindow.hpp"
 #include "tradewindow.hpp"

apps/openmw/mwgui/spellicons.cpp

@@ -1,9 +1,5 @@
 #include "spellicons.hpp"
 
-#include <MyGUI_Widget.h>
-#include <MyGUI_Gui.h>
-#include <MyGUI_ImageBox.h>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/world.hpp"
@@ -14,7 +10,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "../mwmechanics/activespells.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
 #include "tooltips.hpp"

apps/openmw/mwgui/spellwindow.cpp

@@ -1,22 +1,14 @@
 #include "spellwindow.hpp"
 
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/actionequip.hpp"
 
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellsuccess.hpp"
 
 #include "spellicons.hpp"

apps/openmw/mwgui/statswindow.cpp

@@ -1,14 +1,9 @@
 #include "statswindow.hpp"
 
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
@@ -18,7 +13,6 @@
 
 #include "tooltips.hpp"
 
-
 using namespace MWGui;
 const int StatsWindow::sLineHeight = 18;
 

apps/openmw/mwgui/tooltips.cpp

@@ -2,18 +2,11 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <OgreResourceGroupManager.h>
-
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/class.hpp"
-
 #include "mapwindow.hpp"
-#include "widgets.hpp"
 #include "inventorywindow.hpp"
 
 using namespace MWGui;

apps/openmw/mwgui/tradewindow.cpp

@@ -9,7 +9,6 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/manualref.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwgui/travelwindow.cpp

@@ -1,22 +1,15 @@
 #include "travelwindow.hpp"
 
-#include <algorithm>
-
 #include <boost/lexical_cast.hpp>
 
 #include <libs/openengine/ogre/fader.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
-
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 
 #include "inventorywindow.hpp"
 #include "tradewindow.hpp"

apps/openmw/mwgui/waitdialog.cpp

@@ -1,7 +1,5 @@
 #include "waitdialog.hpp"
 
-#include <cmath>
-
 #include <boost/lexical_cast.hpp>
 
 #include <libs/openengine/ogre/fader.hpp>
@@ -11,9 +9,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/timestamp.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwgui/widgets.cpp

@@ -9,8 +9,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/esmstore.hpp"
-
 #undef min
 #undef max
 

apps/openmw/mwgui/windowbase.cpp

@@ -1,7 +1,5 @@
 #include "windowbase.hpp"
 
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/windowmanager.hpp"
 
 using namespace MWGui;

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -1,39 +1,20 @@
 #include "windowmanagerimp.hpp"
 
-#include <cassert>
-#include <iterator>
-
-#include <MyGUI_UString.h>
-
 #include <openengine/ogre/renderer.hpp>
 #include <openengine/gui/manager.hpp>
 
-#include <components/settings/settings.hpp>
-#include <components/translation/translation.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/cellstore.hpp"
-
 #include "console.hpp"
 #include "journalwindow.hpp"
 #include "charactercreation.hpp"
-#include "textinput.hpp"
-#include "review.hpp"
 #include "dialogue.hpp"
 #include "dialoguehistory.hpp"
-#include "mapwindow.hpp"
 #include "statswindow.hpp"
 #include "messagebox.hpp"
-#include "container.hpp"
-#include "inventorywindow.hpp"
 #include "tooltips.hpp"
 #include "scrollwindow.hpp"
 #include "bookwindow.hpp"
-#include "list.hpp"
 #include "hud.hpp"
 #include "mainmenu.hpp"
 #include "countdialog.hpp"
@@ -48,17 +29,15 @@
 #include "loadingscreen.hpp"
 #include "levelupdialog.hpp"
 #include "waitdialog.hpp"
-#include "spellcreationdialog.hpp"
 #include "enchantingdialog.hpp"
 #include "trainingwindow.hpp"
-#include "imagebutton.hpp"
 #include "exposedwindow.hpp"
 #include "cursor.hpp"
-#include "spellicons.hpp"
 #include "merchantrepair.hpp"
 #include "repair.hpp"
 #include "soulgemdialog.hpp"
 #include "companionwindow.hpp"
+#include "inventorywindow.hpp"
 
 using namespace MWGui;
 

apps/openmw/mwgui/windowpinnablebase.cpp

@@ -1,7 +1,5 @@
 #include "windowpinnablebase.hpp"
 
-#include "../mwbase/windowmanager.hpp"
-
 #include "exposedwindow.hpp"
 
 using namespace MWGui;

apps/openmw/mwrender/actors.cpp

@@ -94,6 +94,9 @@ void Actors::insertActivator (const MWWorld::Ptr& ptr)
 
 bool Actors::deleteObject (const MWWorld::Ptr& ptr)
 {
+    if (mAllActors.find(ptr) == mAllActors.end())
+        return false;
+
     mRendering->removeWaterRippleEmitter (ptr);
 
     delete mAllActors[ptr];
@@ -139,6 +142,7 @@ void Actors::removeCell(MWWorld::Ptr::CellStore* store)
         Ogre::SceneNode *base = celliter->second;
         base->removeAndDestroyAllChildren();
         mRend.getScene()->destroySceneNode(base);
+
         mCellSceneNodes.erase(celliter);
     }
 }

apps/openmw/mwrender/npcanimation.cpp

@@ -279,56 +279,83 @@ void NpcAnimation::updateParts(bool forceupdate)
     if(mViewMode == VM_HeadOnly)
         return;
 
-    static const struct {
+    std::map<int, int> bodypartMap;
-        ESM::PartReferenceType type;
+    bodypartMap[ESM::PRT_Neck] = ESM::BodyPart::MP_Neck;
-        const char name[2][12];
+    bodypartMap[ESM::PRT_Cuirass] = ESM::BodyPart::MP_Chest;
-    } PartTypeList[] = {
+    bodypartMap[ESM::PRT_Groin] = ESM::BodyPart::MP_Groin;
-        { ESM::PRT_Neck,      { "neck", "" } },
+    bodypartMap[ESM::PRT_RHand] = ESM::BodyPart::MP_Hand;
-        { ESM::PRT_Cuirass,   { "chest", "" } },
+    bodypartMap[ESM::PRT_LHand] = ESM::BodyPart::MP_Hand;
-        { ESM::PRT_Groin,     { "groin", "" } },
+    bodypartMap[ESM::PRT_RWrist] = ESM::BodyPart::MP_Wrist;
-        { ESM::PRT_RHand,     { "hand", "hands" } },
+    bodypartMap[ESM::PRT_LWrist] = ESM::BodyPart::MP_Wrist;
-        { ESM::PRT_LHand,     { "hand", "hands" } },
+    bodypartMap[ESM::PRT_RForearm] = ESM::BodyPart::MP_Forearm;
-        { ESM::PRT_RWrist,    { "wrist", "" } },
+    bodypartMap[ESM::PRT_LForearm] = ESM::BodyPart::MP_Forearm;
-        { ESM::PRT_LWrist,    { "wrist", "" } },
+    bodypartMap[ESM::PRT_RUpperarm] = ESM::BodyPart::MP_Upperarm;
-        { ESM::PRT_RForearm,  { "forearm", "" } },
+    bodypartMap[ESM::PRT_LUpperarm] = ESM::BodyPart::MP_Upperarm;
-        { ESM::PRT_LForearm,  { "forearm", "" } },
+    bodypartMap[ESM::PRT_RFoot] = ESM::BodyPart::MP_Foot;
-        { ESM::PRT_RUpperarm, { "upper arm", "" } },
+    bodypartMap[ESM::PRT_LFoot] = ESM::BodyPart::MP_Foot;
-        { ESM::PRT_LUpperarm, { "upper arm", "" } },
+    bodypartMap[ESM::PRT_RAnkle] = ESM::BodyPart::MP_Ankle;
-        { ESM::PRT_RFoot,     { "foot", "feet" } },
+    bodypartMap[ESM::PRT_LAnkle] = ESM::BodyPart::MP_Ankle;
-        { ESM::PRT_LFoot,     { "foot", "feet" } },
+    bodypartMap[ESM::PRT_RKnee] = ESM::BodyPart::MP_Knee;
-        { ESM::PRT_RAnkle,    { "ankle", "" } },
+    bodypartMap[ESM::PRT_LKnee] = ESM::BodyPart::MP_Knee;
-        { ESM::PRT_LAnkle,    { "ankle", "" } },
+    bodypartMap[ESM::PRT_RLeg] = ESM::BodyPart::MP_Upperleg;
-        { ESM::PRT_RKnee,     { "knee", "" } },
+    bodypartMap[ESM::PRT_LLeg] = ESM::BodyPart::MP_Upperleg;
-        { ESM::PRT_LKnee,     { "knee", "" } },
+    bodypartMap[ESM::PRT_Tail] = ESM::BodyPart::MP_Tail;
-        { ESM::PRT_RLeg,      { "upper leg", "" } },
-        { ESM::PRT_LLeg,      { "upper leg", "" } },
-        { ESM::PRT_Tail,      { "tail", "" } }
-    };
 
-    const char *ext = (mViewMode == VM_FirstPerson) ? ".1st" : "";
     const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-    for(size_t i = 0;i < sizeof(PartTypeList)/sizeof(PartTypeList[0]);i++)
+
+    const int Flag_Female = 0x01;
+    const int Flag_FirstPerson = 0x02;
+
+    int flags = 0;
+    if (!mNpc->isMale())
+        flags |= Flag_Female;
+    if (mViewMode == VM_FirstPerson)
+        flags |= Flag_FirstPerson;
+
+    // Remember body parts so we only have to search through the store once for each race/gender/viewmode combination
+    static std::map< std::pair<std::string, int> , std::vector<const ESM::BodyPart*> > sRaceMapping;
+    std::string race = Misc::StringUtils::lowerCase(mNpc->mRace);
+    std::pair<std::string, int> thisCombination = std::make_pair(race, flags);
+    if (sRaceMapping.find(thisCombination) == sRaceMapping.end())
     {
-        if(mPartPriorities[PartTypeList[i].type] < 1)
+        sRaceMapping[thisCombination].resize(ESM::PRT_Count);
+        for (int i=0; i<ESM::PRT_Count; ++i)
+            sRaceMapping[thisCombination][i] = NULL;
+
+        const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
+
+        for (MWWorld::Store<ESM::BodyPart>::iterator it = partStore.begin(); it != partStore.end(); ++it)
         {
-            const ESM::BodyPart *part = NULL;
+            const ESM::BodyPart& bodypart = *it;
-            const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
+            if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
-
+                continue;
-            if(!mNpc->isMale())
+            if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
             {
-                part = partStore.search(mBodyPrefix + "_f_" + PartTypeList[i].name[0]+ext);
+                continue;
-                if(part == 0)
-                    part = partStore.search(mBodyPrefix + "_f_" + PartTypeList[i].name[1]+ext);
             }
-            if(part == 0)
+            if (!mNpc->isMale() != (bodypart.mData.mFlags & ESM::BodyPart::BPF_Female))
-                part = partStore.search(mBodyPrefix + "_m_" + PartTypeList[i].name[0]+ext);
+                continue;
-            if(part == 0)
+            if (!Misc::StringUtils::ciEqual(bodypart.mRace, mNpc->mRace))
-                part = partStore.search(mBodyPrefix + "_m_" + PartTypeList[i].name[1]+ext);
+                continue;
 
-            if(part)
+            bool firstPerson = (bodypart.mId.size() >= 3)
-                addOrReplaceIndividualPart(PartTypeList[i].type, -1,1, "meshes\\"+part->mModel);
+                    && bodypart.mId[bodypart.mId.size()-3] == '1'
+                    && bodypart.mId[bodypart.mId.size()-2] == 's'
+                    && bodypart.mId[bodypart.mId.size()-1] == 't';
+            if (firstPerson != (mViewMode == VM_FirstPerson))
+                continue;
+            for (std::map<int, int>::iterator bIt = bodypartMap.begin(); bIt != bodypartMap.end(); ++bIt )
+                if (bIt->second == bodypart.mData.mPart)
+                    sRaceMapping[thisCombination][bIt->first] = &*it;
         }
     }
+
+    for (int part = ESM::PRT_Neck; part < ESM::PRT_Count; ++part)
+    {
+        const ESM::BodyPart* bodypart = sRaceMapping[thisCombination][part];
+        if (mPartPriorities[part] < 1 && bodypart)
+            addOrReplaceIndividualPart(part, -1,1, "meshes\\"+bodypart->mModel);
+    }
 }
 
 NifOgre::ObjectList NpcAnimation::insertBoundedPart(const std::string &model, int group, const std::string &bonename)

apps/openmw/mwrender/videoplayer.cpp

@@ -788,8 +788,8 @@ void VideoState::decode_thread_loop(VideoState *self)
         // main decode loop
         while(!self->quit)
         {
-            if((self->audio_st >= 0 && self->audioq.size > MAX_AUDIOQ_SIZE) ||
+            if((self->audio_st && self->audioq.size > MAX_AUDIOQ_SIZE) ||
-               (self->video_st >= 0 && self->videoq.size > MAX_VIDEOQ_SIZE))
+               (self->video_st && self->videoq.size > MAX_VIDEOQ_SIZE))
             {
                 boost::this_thread::sleep(boost::posix_time::milliseconds(10));
                 continue;

apps/openmw/mwworld/cellfunctors.hpp

@@ -13,8 +13,8 @@ namespace ESM
 
 namespace MWWorld
 {
-    /// List all (Ogre-)handles.
+    /// List all (Ogre-)handles, then reset RefData::mBaseNode to 0.
-    struct ListHandles
+    struct ListAndResetHandles
     {
         std::vector<Ogre::SceneNode*> mHandles;
 
@@ -23,6 +23,8 @@ namespace MWWorld
             Ogre::SceneNode* handle = data.getBaseNode();
             if (handle)
                 mHandles.push_back (handle);
+
+            data.setBaseNode(0);
             return true;
         }
     };

apps/openmw/mwworld/scene.cpp

@@ -76,27 +76,28 @@ namespace MWWorld
     void Scene::unloadCell (CellStoreCollection::iterator iter)
     {
         std::cout << "Unloading cell\n";
-        ListHandles functor;
+        ListAndResetHandles functor;
 
-        (*iter)->forEach<ListHandles>(functor);
+        (*iter)->forEach<ListAndResetHandles>(functor);
         {
             // silence annoying g++ warning
             for (std::vector<Ogre::SceneNode*>::const_iterator iter2 (functor.mHandles.begin());
-                iter2!=functor.mHandles.end(); ++iter2){
+                iter2!=functor.mHandles.end(); ++iter2)
-                 Ogre::SceneNode* node = *iter2;
+            {
+                Ogre::SceneNode* node = *iter2;
                 mPhysics->removeObject (node->getName());
             }
+        }
 
-            if ((*iter)->mCell->isExterior())
+        if ((*iter)->mCell->isExterior())
-            {
+        {
-                ESM::Land* land =
+            ESM::Land* land =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(
-                        (*iter)->mCell->getGridX(),
+                    (*iter)->mCell->getGridX(),
-                        (*iter)->mCell->getGridY()
+                    (*iter)->mCell->getGridY()
-                    );
+                );
-                if (land)
+            if (land)
-                    mPhysics->removeHeightField( (*iter)->mCell->getGridX(), (*iter)->mCell->getGridY() );
+                mPhysics->removeHeightField( (*iter)->mCell->getGridX(), (*iter)->mCell->getGridY() );
-            }
         }
 
         mRendering.removeCell(*iter);

components/esm/loadarmo.hpp

@@ -38,7 +38,9 @@ enum PartReferenceType
     PRT_RPauldron = 23,
     PRT_LPauldron = 24,
     PRT_Weapon = 25,
-    PRT_Tail = 26
+    PRT_Tail = 26,
+
+    PRT_Count = 27
 };
 
 // Reference to body parts

components/esm/loadbody.cpp

@@ -9,13 +9,13 @@ namespace ESM
 void BodyPart::load(ESMReader &esm)
 {
     mModel = esm.getHNString("MODL");
-    mName = esm.getHNString("FNAM");
+    mRace = esm.getHNString("FNAM");
     esm.getHNT(mData, "BYDT", 4);
 }
 void BodyPart::save(ESMWriter &esm)
 {
     esm.writeHNCString("MODL", mModel);
-    esm.writeHNCString("FNAM", mName);
+    esm.writeHNCString("FNAM", mRace);
     esm.writeHNT("BYDT", mData, 4);
 }
 

components/esm/loadbody.hpp

@@ -27,7 +27,9 @@ struct BodyPart
         MP_Knee = 11,
         MP_Upperleg = 12,
         MP_Clavicle = 13,
-        MP_Tail = 14
+        MP_Tail = 14,
+
+        MP_Count = 15
     };
 
     enum Flags
@@ -52,7 +54,7 @@ struct BodyPart
     };
 
     BYDTstruct mData;
-    std::string mId, mModel, mName;
+    std::string mId, mModel, mRace;
 
     void load(ESMReader &esm);
     void save(ESMWriter &esm);