evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix last aim being held when unequipping MaterialItem while holding fire

Browse Source
This commit is contained in:
Kae 2023-07-31 16:41:12 +10:00
parent 830d4deb7b
commit 72e33fdef5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/game/items/StarMaterialItem.cpp
View File

@ -45,6 +45,10 @@ void MaterialItem::init(ToolUserEntity* owner, ToolHand hand) {
BeamItem::init(owner, hand); BeamItem::init(owner, hand);
} }
void MaterialItem::uninit() {
m_lastAimPosition.reset();
}
void MaterialItem::update(float dt, FireMode fireMode, bool shifting, HashSet<MoveControlType> const& moves) { void MaterialItem::update(float dt, FireMode fireMode, bool shifting, HashSet<MoveControlType> const& moves) {
FireableItem::update(dt, fireMode, shifting, moves); FireableItem::update(dt, fireMode, shifting, moves);
BeamItem::update(dt, fireMode, shifting, moves); BeamItem::update(dt, fireMode, shifting, moves);

1
source/game/items/StarMaterialItem.hpp
View File

@ -18,6 +18,7 @@ public:
ItemPtr clone() const override; ItemPtr clone() const override;
void init(ToolUserEntity* owner, ToolHand hand) override; void init(ToolUserEntity* owner, ToolHand hand) override;
void uninit() override;
void update(float dt, FireMode fireMode, bool shifting, HashSet<MoveControlType> const& moves) override; void update(float dt, FireMode fireMode, bool shifting, HashSet<MoveControlType> const& moves) override;
List<Drawable> nonRotatedDrawables() const override; List<Drawable> nonRotatedDrawables() const override;