teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Cleaned up code

Browse source
This commit is contained in:
Jeffrey Haines 2014-04-03 01:07:56 -04:00
parent 58b135a2be
commit b1abef7a38
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -867,7 +867,7 @@ namespace MWMechanics
} }
} }
} }
if(reported) if (reported)
reportCrime(ptr, victim, type, arg); reportCrime(ptr, victim, type, arg);
return reported; return reported;
} }

1
apps/openmw/mwscript/miscextensions.cpp
View file

@ -822,6 +822,7 @@ namespace MWScript
{ {
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
player.getClass().getNpcStats(player).setBounty(0); player.getClass().getNpcStats(player).setBounty(0);
MWBase::Environment::get().getWorld()->confiscateStolenItems(player);
} }
}; };

3
apps/openmw/mwworld/player.hpp
View file

@ -41,8 +41,7 @@ namespace MWWorld
bool mAutoMove; bool mAutoMove;
int mForwardBackward; int mForwardBackward;
bool mTeleported; bool mTeleported;
std::vector<MWWorld::Ptr> mWitnesses;
public: public:
Player(const ESM::NPC *player, const MWBase::World& world); Player(const ESM::NPC *player, const MWBase::World& world);

1
apps/openmw/mwworld/worldimp.cpp
View file

@ -29,7 +29,6 @@
#include "../mwmechanics/spellcasting.hpp" #include "../mwmechanics/spellcasting.hpp"
#include "../mwmechanics/levelledlist.hpp" #include "../mwmechanics/levelledlist.hpp"
#include "../mwmechanics/combat.hpp" #include "../mwmechanics/combat.hpp"
#include "../mwmechanics/actors.hpp"
#include "../mwrender/sky.hpp" #include "../mwrender/sky.hpp"
#include "../mwrender/animation.hpp" #include "../mwrender/animation.hpp"