mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 14:09:42 +00:00
Code Issues Releases Wiki Activity

made player respect NpcStats for mDrawState

Browse source
This commit is contained in:
Aleksandar Jovanov 2012-04-08 19:43:04 +02:00
parent 23cc1d17ca
commit 9893e4b384
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwworld/player.cpp
View file

@ -4,6 +4,7 @@
#include "../mwrender/player.hpp" #include "../mwrender/player.hpp"
#include "../mwmechanics/movement.hpp" #include "../mwmechanics/movement.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "world.hpp" #include "world.hpp"
#include "class.hpp" #include "class.hpp"
@ -12,7 +13,7 @@ namespace MWWorld
{ {
Player::Player (MWRender::Player *renderer, const ESM::NPC *player, MWWorld::World& world) : Player::Player (MWRender::Player *renderer, const ESM::NPC *player, MWWorld::World& world) :
mCellStore (0), mRenderer (renderer), mWorld (world), mClass (0), mCellStore (0), mRenderer (renderer), mWorld (world), mClass (0),
mAutoMove (false), mForwardBackward (0) , mDrawState(DrawState_Nothing) mAutoMove (false), mForwardBackward (0)
{ {
mPlayer.base = player; mPlayer.base = player;
mPlayer.ref.refID = "player"; mPlayer.ref.refID = "player";
@ -50,7 +51,8 @@ namespace MWWorld
void Player::setDrawState(const DrawState& value) void Player::setDrawState(const DrawState& value)
{ {
mDrawState = value; MWWorld::Ptr ptr = getPlayer();
MWWorld::Class::get(ptr).getNpcStats(ptr).mDrawState = value;
} }
void Player::setAutoMove (bool enable) void Player::setAutoMove (bool enable)
@ -94,4 +96,10 @@ namespace MWWorld
MWWorld::Class::get (ptr).setStance (ptr, MWWorld::Class::Run, !running); MWWorld::Class::get (ptr).setStance (ptr, MWWorld::Class::Run, !running);
} }
DrawState Player::getDrawState()
{
MWWorld::Ptr ptr = getPlayer();
return MWWorld::Class::get(ptr).getNpcStats(ptr).mDrawState;
}
} }

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

@ -33,7 +33,6 @@ namespace MWWorld
ESM::Class *mClass; ESM::Class *mClass;
bool mAutoMove; bool mAutoMove;
int mForwardBackward; int mForwardBackward;
DrawState mDrawState;
public: public:
Player(MWRender::Player *renderer, const ESM::NPC *player, MWWorld::World& world); Player(MWRender::Player *renderer, const ESM::NPC *player, MWWorld::World& world);
@ -110,7 +109,7 @@ namespace MWWorld
return mAutoMove; return mAutoMove;
} }
DrawState getDrawState() { return mDrawState; } DrawState getDrawState();
void setAutoMove (bool enable); void setAutoMove (bool enable);