mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:53:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2759 from Capostrophic/lightsource

Browse source 
Don't use up light duration if the held light is hidden (bug #5352)
This commit is contained in:
Andrei Kortunov 2020-04-04 22:04:08 +04:00 committed by GitHub
commit bb7c2ac630
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -211,6 +211,7 @@
Bug #5326: Formatting issues in the settings.cfg
Bug #5328: Skills aren't properly reset for dead actors
Bug #5345: Dopey Necromancy does not work due to a missing quote
Bug #5352: Light source items' duration is decremented while they aren't visible
Feature #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls

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

@ -1268,19 +1268,23 @@ namespace MWMechanics
// Use time from the player's light
if(isPlayer)
{
float timeRemaining = heldIter->getClass().getRemainingUsageTime(*heldIter);
// -1 is infinite light source. Other negative values are treated as 0.
if(timeRemaining != -1.0f)
// But avoid using it up if the light source is hidden
MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
if (anim && anim->getCarriedLeftShown())
{
timeRemaining -= duration;
float timeRemaining = heldIter->getClass().getRemainingUsageTime(*heldIter);
if(timeRemaining > 0.0f)
heldIter->getClass().setRemainingUsageTime(*heldIter, timeRemaining);
else
// -1 is infinite light source. Other negative values are treated as 0.
if (timeRemaining != -1.0f)
{
inventoryStore.remove(*heldIter, 1, ptr); // remove it
return;
timeRemaining -= duration;
if (timeRemaining <= 0.f)
{
inventoryStore.remove(*heldIter, 1, ptr); // remove it
return;
}
heldIter->getClass().setRemainingUsageTime(*heldIter, timeRemaining);
}
}
}

1
apps/openmw/mwrender/animation.hpp
View file

@ -459,6 +459,7 @@ public:
virtual bool useShieldAnimations() const { return false; }
virtual void showWeapons(bool showWeapon) {}
virtual bool getCarriedLeftShown() const { return false; }
virtual void showCarriedLeft(bool show) {}
virtual void setWeaponGroup(const std::string& group, bool relativeDuration) {}
virtual void setVampire(bool vampire) {}

2
apps/openmw/mwrender/creatureanimation.hpp
View file

@ -31,6 +31,8 @@ namespace MWRender
virtual void equipmentChanged() { updateParts(); }
virtual void showWeapons(bool showWeapon);
virtual bool getCarriedLeftShown() const { return mShowCarriedLeft; }
virtual void showCarriedLeft(bool show);
void updateParts();

2
apps/openmw/mwrender/npcanimation.hpp
View file

@ -129,6 +129,8 @@ public:
virtual void setPitchFactor(float factor) { mPitchFactor = factor; }
virtual void showWeapons(bool showWeapon);
virtual bool getCarriedLeftShown() const { return mShowCarriedLeft; }
virtual void showCarriedLeft(bool show);
virtual void attachArrow();