some skill usage fixes

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -431,7 +431,6 @@ namespace MWDialogue
     void DialogueManager::persuade(int type)
     {
         bool success;
-	bool skillincrease = 1;
         float temp, perm;
         MWBase::Environment::get().getMechanicsManager()->getPersuasionDispositionChange(
                     mActor, MWBase::MechanicsManager::PersuasionType(type), mTemporaryDispositionChange,
@@ -457,14 +456,10 @@ namespace MWDialogue
             text = "sIntimidate";
         else{
             text = "sBribe";
-	    skillincrease = success;
-	}
-	
-	if (skillincrease){
-	  // practice skill
-	  MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
-	  MWWorld::Class::get(player).skillUsageSucceeded(player, ESM::Skill::Speechcraft, -1);
-	}
+        }
+
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+        MWWorld::Class::get(player).skillUsageSucceeded(player, ESM::Skill::Speechcraft, success ? 0 : 1);
 
         text += (success ? "Success" : "Fail");
 

apps/openmw/mwgui/tradewindow.cpp

@@ -211,7 +211,7 @@ namespace MWGui
                 + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange()),100));
 
             MWMechanics::NpcStats sellerSkill = MWWorld::Class::get(mPtr).getNpcStats(mPtr);
-            MWMechanics::CreatureStats sellerStats = MWWorld::Class::get(mPtr).getCreatureStats(mPtr); 
+            MWMechanics::CreatureStats sellerStats = MWWorld::Class::get(mPtr).getCreatureStats(mPtr);
             MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
             MWMechanics::NpcStats playerSkill = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
             MWMechanics::CreatureStats playerStats = MWWorld::Class::get(playerPtr).getCreatureStats(playerPtr);
@@ -239,9 +239,9 @@ namespace MWGui
                 MWBase::Environment::get().getDialogueManager()->applyTemporaryDispositionChange(iBarterFailDisposition);
                 return;
             }
-            
+
             //skill use!
-	    MWWorld::Class::get(playerPtr).skillUsageSucceeded(playerPtr, ESM::Skill::Mercantile, 0);
+            MWWorld::Class::get(playerPtr).skillUsageSucceeded(playerPtr, ESM::Skill::Mercantile, 0);
 	}
 
         int iBarterSuccessDisposition = gmst.find("iBarterSuccessDisposition")->getInt();