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

Fix forced switch to third person on death not always working

Browse source 
For instance, when dying from fall damage
This commit is contained in:
scrawl 2014-06-05 17:21:02 +02:00
parent b6e52ae8ab
commit d2e98c4de1
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwmechanics/character.cpp
View file

@ -409,6 +409,13 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
void CharacterController::playDeath(float startpoint, CharacterState death)
{
if (mPtr == MWBase::Environment::get().getWorld()->getPlayerPtr())
{
// The first-person animations do not include death, so we need to
// force-switch to third person before playing the death animation.
MWBase::Environment::get().getWorld()->useDeathCamera();
}
switch (death)
{
case CharState_SwimDeath:

4
apps/openmw/mwrender/camera.cpp
View file

@ -140,11 +140,11 @@ namespace MWRender
}
}
void Camera::toggleViewMode()
void Camera::toggleViewMode(bool force)
{
// Changing the view will stop all playing animations, so if we are playing
// anything important, queue the view change for later
if (!mAnimation->allowSwitchViewMode())
if (!mAnimation->allowSwitchViewMode() && !force)
{
mViewModeToggleQueued = true;
return;

3
apps/openmw/mwrender/camera.hpp
View file

@ -75,7 +75,8 @@ namespace MWRender
/// Attach camera to object
void attachTo(const MWWorld::Ptr &);
void toggleViewMode();
/// @param Force view mode switch, even if currently not allowed by the animation.
void toggleViewMode(bool force=false);
bool toggleVanityMode(bool enable);
void allowVanityMode(bool allow);

1
apps/openmw/mwstate/statemanagerimp.cpp
View file

@ -144,7 +144,6 @@ void MWState::StateManager::newGame (bool bypass)
void MWState::StateManager::endGame()
{
mState = State_Ended;
MWBase::Environment::get().getWorld()->useDeathCamera();
}
void MWState::StateManager::saveGame (const std::string& description, const Slot *slot)

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

@ -432,7 +432,7 @@ namespace MWWorld
mRendering->getCamera()->toggleVanityMode(false);
}
if(mRendering->getCamera()->isFirstPerson())
togglePOV();
mRendering->getCamera()->toggleViewMode(true);
}
MWWorld::Player& World::getPlayer()