mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-15 23:42:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #974 from Allofich/Disposition

Browse Source 
Update disposition check between persuasion attempts
This commit is contained in:
scrawl 2016-06-21 18:48:31 +02:00 committed by GitHub
commit 4dc032084c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
View File

@ -92,7 +92,7 @@ namespace MWMechanics
virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying); virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying);
///< This is used by every service to determine the price of objects given the trading skills of the player and NPC. ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = false); virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = true);
///< Calculate the diposition of an NPC toward the player. ///< Calculate the diposition of an NPC toward the player.
virtual int countDeaths (const std::string& id) const; virtual int countDeaths (const std::string& id) const;