diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp index 2edb3d177..39cf63cd0 100644 --- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp +++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp @@ -867,7 +867,7 @@ namespace MWMechanics } } } - if(reported) + if (reported) reportCrime(ptr, victim, type, arg); return reported; } diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp index cd29e2c91..a7f31c80b 100644 --- a/apps/openmw/mwscript/miscextensions.cpp +++ b/apps/openmw/mwscript/miscextensions.cpp @@ -822,6 +822,7 @@ namespace MWScript { MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); player.getClass().getNpcStats(player).setBounty(0); + MWBase::Environment::get().getWorld()->confiscateStolenItems(player); } }; diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp index b41e6fc9f..9d3fbbeec 100644 --- a/apps/openmw/mwworld/player.hpp +++ b/apps/openmw/mwworld/player.hpp @@ -41,8 +41,7 @@ namespace MWWorld bool mAutoMove; int mForwardBackward; bool mTeleported; - - std::vector mWitnesses; + public: Player(const ESM::NPC *player, const MWBase::World& world); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index f3e404c35..ac6f9d380 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -29,7 +29,6 @@ #include "../mwmechanics/spellcasting.hpp" #include "../mwmechanics/levelledlist.hpp" #include "../mwmechanics/combat.hpp" -#include "../mwmechanics/actors.hpp" #include "../mwrender/sky.hpp" #include "../mwrender/animation.hpp"