Merge remote-tracking branch 'jeffreyhaines/master'

This commit is contained in:
Marc Zinnschlag 2014-03-29 13:29:06 +01:00
commit adab85eeb7

View file

@ -76,7 +76,7 @@ namespace MWGui
else /*if (sender == mBribe1000Button)*/ else /*if (sender == mBribe1000Button)*/
{ {
player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, 1000, player); player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, 1000, player);
mReceiver.getClass().getContainerStore(mReceiver).add(MWWorld::ContainerStore::sGoldId, 10000, mReceiver); mReceiver.getClass().getContainerStore(mReceiver).add(MWWorld::ContainerStore::sGoldId, 1000, mReceiver);
type = MWBase::MechanicsManager::PT_Bribe1000; type = MWBase::MechanicsManager::PT_Bribe1000;
} }