mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 18:56:38 +00:00
Code Issues Releases Wiki Activity

flag game as ended when player dies

Browse source
This commit is contained in:
Marc Zinnschlag 2013-11-18 15:38:08 +01:00
parent 82c8495338
commit f45cff8aff
4 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/statemanager.hpp
View file

@ -39,6 +39,8 @@ namespace MWBase
///< Start a new game.
///
/// \param bypass Skip new game mechanics.
virtual void endGame() = 0;
};
}

25
apps/openmw/mwmechanics/actors.cpp
View file

@ -17,6 +17,7 @@
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/soundmanager.hpp"
#include "../mwbase/statemanager.hpp"
#include "npcstats.hpp"
#include "creaturestats.hpp"
@ -344,20 +345,24 @@ namespace MWMechanics
continue;
}
// If it's the player and God Mode is turned on, keep it alive
if(iter->first.getRefData().getHandle()=="player" &&
MWBase::Environment::get().getWorld()->getGodModeState())
if (iter->first.getRefData().getHandle()=="player")
{
MWMechanics::DynamicStat<float> stat(stats.getHealth());
if(stat.getModified()<1)
// If it's the player and God Mode is turned on, keep it alive
if (MWBase::Environment::get().getWorld()->getGodModeState())
{
stat.setModified(1, 0);
stats.setHealth(stat);
MWMechanics::DynamicStat<float> stat (stats.getHealth());
if (stat.getModified()<1)
{
stat.setModified(1, 0);
stats.setHealth(stat);
}
stats.resurrect();
continue;
}
stats.resurrect();
continue;
MWBase::Environment::get().getStateManager()->endGame();
}
if(iter->second->isDead())

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

@ -46,3 +46,8 @@ void MWState::StateManager::newGame (bool bypass)
mState = State_Running;
}
void MWState::StateManager::endGame()
{
mState = State_Ended;
}

2
apps/openmw/mwstate/statemanagerimp.hpp
View file

@ -24,6 +24,8 @@ namespace MWState
///< Start a new game.
///
/// \param bypass Skip new game mechanics.
virtual void endGame();
};
}