mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Implement continuous damage indication (Fixes #1970)

Browse source
This commit is contained in:
MiroslavR 2014-10-11 22:21:48 +02:00
parent 4dc613a04b
commit 0ae604990e
7 changed files with 54 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -338,7 +338,7 @@ namespace MWBase
/// Darken the screen by \a factor (1.0 = no darkening). Works independently from screen fading.
virtual void setScreenFactor (float factor) = 0;
virtual void activateHitOverlay() = 0;
virtual void activateHitOverlay(bool interrupt=true) = 0;
virtual void setWerewolfOverlay(bool set) = 0;
virtual void toggleDebugWindow() = 0;

5
apps/openmw/mwgui/screenfader.cpp
View file

@ -131,6 +131,11 @@ namespace MWGui
mQueue.push_back(FadeOp::Ptr(new FadeOp(this, time, targetAlpha)));
}
bool ScreenFader::isEmpty()
{
return mQueue.empty();
}
void ScreenFader::clearQueue()
{
mQueue.clear();

1
apps/openmw/mwgui/screenfader.hpp
View file

@ -48,6 +48,7 @@ namespace MWGui
void setRepeat(bool repeat);
void queue(float time, float targetAlpha);
bool isEmpty();
void clearQueue();
void notifyAlphaChanged(float alpha);

9
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1756,14 +1756,17 @@ namespace MWGui
mScreenFader->setFactor(factor);
}
void WindowManager::activateHitOverlay()
void WindowManager::activateHitOverlay(bool interrupt)
{
if (!mHitFaderEnabled)
return;
if (!interrupt && !mHitFader->isEmpty())
return;
mHitFader->clearQueue();
mHitFader->fadeTo(50, 0.2f);
mHitFader->fadeTo(0, 0.2f);
mHitFader->fadeTo(100, 0.0f);
mHitFader->fadeTo(0, 0.5f);
}
void WindowManager::setWerewolfOverlay(bool set)

2
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -333,7 +333,7 @@ namespace MWGui
/// Darken the screen by \a factor (1.0 = no darkening). Works independently from screen fading.
virtual void setScreenFactor (float factor);
virtual void activateHitOverlay();
virtual void activateHitOverlay(bool interrupt);
virtual void setWerewolfOverlay(bool set);
virtual void toggleDebugWindow();

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

@ -592,6 +592,7 @@ namespace MWMechanics
};
DynamicStat<float> health = creatureStats.getHealth();
bool receivedMagicDamage = false;
for (unsigned int i=0; i<sizeof(damageEffects)/sizeof(int); ++i)
{
float magnitude = creatureStats.getMagicEffects().get(damageEffects[i]).getMagnitude();
@ -612,11 +613,22 @@ namespace MWMechanics
if (weather > 1)
damageScale *= fMagicSunBlockedMult;
health.setCurrent(health.getCurrent() - magnitude * duration * damageScale);
if (magnitude * damageScale > 0.0f)
receivedMagicDamage = true;
}
else
{
health.setCurrent(health.getCurrent() - magnitude * duration);
if (magnitude > 0.0f)
receivedMagicDamage = true;
}
}
if (receivedMagicDamage && ptr.getRefData().getHandle() == "player")
MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
creatureStats.setHealth(health);
if (!wasDead && creatureStats.isDead())
@ -875,13 +887,13 @@ namespace MWMechanics
static const float fSuffocationDamage = world->getStore().get<ESM::GameSetting>().find("fSuffocationDamage")->getFloat();
ptr.getClass().setActorHealth(ptr, stats.getHealth().getCurrent() - fSuffocationDamage*duration);
// Play a drowning sound as necessary for the player
// Play a drowning sound
MWBase::SoundManager *sndmgr = MWBase::Environment::get().getSoundManager();
if(!sndmgr->getSoundPlaying(ptr, "drown"))
sndmgr->playSound3D(ptr, "drown", 1.0f, 1.0f);
if(ptr == world->getPlayerPtr())
{
MWBase::SoundManager *sndmgr = MWBase::Environment::get().getSoundManager();
if(!sndmgr->getSoundPlaying(MWWorld::Ptr(), "drown"))
sndmgr->playSound("drown", 1.0f, 1.0f);
}
MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
}
}
else

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

@ -2087,9 +2087,20 @@ namespace MWWorld
continue;
MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
if (stats.isDead())
continue;
MWMechanics::DynamicStat<float> health = stats.getHealth();
health.setCurrent(health.getCurrent()-healthPerSecond*MWBase::Environment::get().getFrameDuration());
stats.setHealth(health);
if (healthPerSecond > 0.0f)
{
if (actor.getRefData().getHandle() == "player")
MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
if (!MWBase::Environment::get().getSoundManager()->getSoundPlaying(actor, "Health Damage"))
MWBase::Environment::get().getSoundManager()->playSound3D(actor, "Health Damage", 1.0f, 1.0f);
}
}
}
@ -2104,9 +2115,20 @@ namespace MWWorld
continue;
MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
if (stats.isDead())
continue;
MWMechanics::DynamicStat<float> health = stats.getHealth();
health.setCurrent(health.getCurrent()-healthPerSecond*MWBase::Environment::get().getFrameDuration());
stats.setHealth(health);
if (healthPerSecond > 0.0f)
{
if (actor.getRefData().getHandle() == "player")
MWBase::Environment::get().getWindowManager()->activateHitOverlay(false);
if (!MWBase::Environment::get().getSoundManager()->getSoundPlaying(actor, "Health Damage"))
MWBase::Environment::get().getSoundManager()->playSound3D(actor, "Health Damage", 1.0f, 1.0f);
}
}
}