mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 12:39:41 +00:00
Code Issues Releases Wiki Activity

Make getWeaponDrawn return 1 only when the weapon is attached (bug #4816)

Browse source
This commit is contained in:
Alexei Kotov 2022-08-18 05:04:51 +03:00
parent 28d6159b86
commit d458894868
5 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
------
Bug #4127: Weapon animation looks choppy
Bug #4816: GetWeaponDrawn returns 1 before weapon is attached
Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses
Bug #5129: Stuttering animation on Centurion Archer
Bug #5977: Fatigueless NPCs' corpse underwater changes animation on game load

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

@ -465,6 +465,7 @@ public:
const osg::Node* getNode(const std::string& name) const;
virtual bool useShieldAnimations() const { return false; }
virtual bool getWeaponsShown() const { return false; }
virtual void showWeapons(bool showWeapon) {}
virtual bool getCarriedLeftShown() const { return false; }
virtual void showCarriedLeft(bool show) {}

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

@ -30,6 +30,7 @@ namespace MWRender
void equipmentChanged() override { updateParts(); }
bool getWeaponsShown() const override { return mShowWeapons; }
void showWeapons(bool showWeapon) override;
bool getCarriedLeftShown() const override { return mShowCarriedLeft; }

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

@ -135,6 +135,7 @@ public:
/// to indicate the facing orientation of the character.
void setPitchFactor(float factor) override { mPitchFactor = factor; }
bool getWeaponsShown() const override { return mShowWeapons; }
void showWeapons(bool showWeapon) override;
bool updateCarriedLeftVisible(const int weaptype) const override;

18
apps/openmw/mwscript/miscextensions.cpp
View file

@ -47,6 +47,8 @@
#include "../mwmechanics/spellcasting.hpp"
#include "../mwmechanics/actorutil.hpp"
#include "../mwrender/animation.hpp"
#include "interpretercontext.hpp"
#include "ref.hpp"
@ -781,9 +783,21 @@ namespace MWScript
void execute (Interpreter::Runtime& runtime) override
{
MWWorld::Ptr ptr = R()(runtime);
auto& cls = ptr.getClass();
if (!cls.hasInventoryStore(ptr) && !cls.isBipedal(ptr))
{
runtime.push(0);
return;
}
runtime.push((ptr.getClass().hasInventoryStore(ptr) || ptr.getClass().isBipedal(ptr)) &&
ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState::Weapon);
if (cls.getCreatureStats(ptr).getDrawState () != MWMechanics::DrawState::Weapon)
{
runtime.push(0);
return;
}
MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
runtime.push(anim && anim->getWeaponsShown());
}
};