Merge pull request #195 from OpenMW/master

Add OpenMW commits up to 10 Apr 2017

apps/openmw/mwgui/recharge.cpp

@@ -12,6 +12,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
@@ -137,10 +138,16 @@ void Recharge::onItemClicked(MyGUI::Widget *sender, const MWWorld::Ptr& item)
         item.getCellRef().setEnchantmentCharge(
             std::min(item.getCellRef().getEnchantmentCharge() + restored, static_cast<float>(enchantment->mData.mCharge)));
 
+        MWBase::Environment::get().getSoundManager()->playSound("Enchant Success",1,1);
+
         player.getClass().getContainerStore(player).restack(item);
 
         player.getClass().skillUsageSucceeded (player, ESM::Skill::Enchant, 0);
     }
+    else
+    {
+        MWBase::Environment::get().getSoundManager()->playSound("Enchant Fail",1,1);
+    }
 
     gem.getContainerStore()->remove(gem, 1, player);
 

apps/openmw/mwgui/repair.cpp

@@ -11,6 +11,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -62,6 +63,8 @@ void Repair::exit()
 
 void Repair::startRepairItem(const MWWorld::Ptr &item)
 {
+    MWBase::Environment::get().getSoundManager()->playSound("Item Repair Up",1,1);
+
     mRepair.setTool(item);
 
     mToolIcon->setItem(item);

apps/openmw/mwmechanics/repair.cpp

@@ -99,6 +99,9 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
             if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), mTool.getCellRef().getRefId()))
             {
                 mTool = *iter;
+
+                MWBase::Environment::get().getSoundManager()->playSound("Item Repair Up",1,1);
+
                 break;
             }
         }

components/misc/resourcehelpers.cpp

@@ -127,9 +127,7 @@ std::string Misc::ResourceHelpers::correctBookartPath(const std::string &resPath
 std::string Misc::ResourceHelpers::correctActorModelPath(const std::string &resPath, const VFS::Manager* vfs)
 {
     std::string mdlname = resPath;
-    std::string::size_type p = mdlname.rfind('\\');
-    if(p == std::string::npos)
-        p = mdlname.rfind('/');
+    std::string::size_type p = mdlname.find_last_of("/\\");
     if(p != std::string::npos)
         mdlname.insert(mdlname.begin()+p+1, 'x');
     else