Merge pull request #57 from OpenMW/master

Add OpenMW commits up to 17 Sep

AUTHORS.md

@@ -123,6 +123,7 @@ Programmers
     smbas
     Stefan Galowicz (bogglez)
     Stanislav Bobrov (Jiub)
+    stil-t
     svaante
     Sylvain Thesnieres (Garvek)
     t6

apps/openmw/mwgui/bookpage.cpp

@@ -275,9 +275,12 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
             if (i->match (fontName, fontColour, fontColour, fontColour, 0))
                 return &*i;
 
-        StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
+        MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fontName);
+        if (!font)
+            throw std::runtime_error(std::string("can't find font ") + fontName);
 
-        style.mFont = MyGUI::FontManager::getInstance().getByName(fontName);
+        StyleImpl & style = *mBook->mStyles.insert (mBook->mStyles.end (), StyleImpl ());
+        style.mFont = font;
         style.mHotColour = fontColour;
         style.mActiveColour = fontColour;
         style.mNormalColour = fontColour;

apps/openmw/mwgui/formatting.cpp

@@ -413,7 +413,10 @@ namespace MWGui
         int TextElement::currentFontHeight() const
         {
             std::string fontName(mTextStyle.mFont == "Default" ? MyGUI::FontManager::getInstance().getDefaultFont() : mTextStyle.mFont);
-            return MyGUI::FontManager::getInstance().getByName(fontName)->getDefaultHeight();
+            MyGUI::IFont* font = MyGUI::FontManager::getInstance().getByName(fontName);
+            if (!font)
+                return 0;
+            return font->getDefaultHeight();
         }
 
         int TextElement::getHeight()

apps/wizard/unshield/unshieldworker.cpp

@@ -302,7 +302,7 @@ bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString
 
 bool Wizard::UnshieldWorker::installFile(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource)
 {
-    return installFiles(fileName, path, flags, true, keepSource);
+    return installFiles(fileName, path, flags, keepSource, true);
 }
 
 bool Wizard::UnshieldWorker::installFiles(const QString &fileName, const QString &path, Qt::MatchFlags flags, bool keepSource, bool single)

components/nifosg/userdata.hpp

@@ -38,8 +38,7 @@ namespace NifOsg
         // Decomposing the original components from the 4x4 matrix isn't possible, which causes
         // problems when a KeyframeController wants to change only one of these components. So
         // we store the scale and rotation components separately here.
-        // Note for a cleaner solution it would be possible to write a custom Transform node,
-        // but then we have to fork osgAnimation :/
+        // Note for a cleaner solution it would be possible to write a custom Transform node
         float mScale;
         Nif::Matrix3 mRotationScale;
     };