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

Fix camera not being attached properly when player becomes vampire (Fixes #2319)

Browse source
This commit is contained in:
scrawl 2015-01-28 19:14:57 +01:00
parent 9bcc84ceec
commit f4c8064d39
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwbase/world.hpp
View file

@ -453,6 +453,7 @@ namespace MWBase
/// \todo Probably shouldn't be here
virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) = 0;
virtual void reattachPlayerCamera() = 0;
/// \todo this does not belong here
virtual void frameStarted (float dt, bool paused) = 0;

5
apps/openmw/mwrender/npcanimation.cpp
View file

@ -1020,7 +1020,10 @@ void NpcAnimation::setVampire(bool vampire)
return;
if ((mNpcType == Type_Vampire) != vampire)
{
rebuild();
if (mPtr == MWBase::Environment::get().getWorld()->getPlayerPtr())
MWBase::Environment::get().getWorld()->reattachPlayerCamera();
else
rebuild();
}
}

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

@ -2457,6 +2457,11 @@ namespace MWWorld
return mLevitationEnabled;
}
void World::reattachPlayerCamera()
{
mRendering->rebuildPtr(getPlayerPtr());
}
void World::setWerewolf(const MWWorld::Ptr& actor, bool werewolf)
{
MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats(actor);

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

@ -537,6 +537,7 @@ namespace MWWorld
/// \todo Probably shouldn't be here
virtual MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr);
virtual void reattachPlayerCamera();
/// \todo this does not belong here
virtual void frameStarted (float dt, bool paused);