mirror of
https://github.com/OpenMW/openmw.git
synced 2025-12-02 19:34:34 +00:00
Don't harvest if player activation is blocked (#8612)
This commit is contained in:
parent
f5de0d1c40
commit
fe7970421f
1 changed files with 6 additions and 5 deletions
|
|
@ -192,12 +192,13 @@ namespace MWClass
|
||||||
{
|
{
|
||||||
if (!isTrapped)
|
if (!isTrapped)
|
||||||
{
|
{
|
||||||
if (canBeHarvested(ptr))
|
if (!canBeHarvested(ptr))
|
||||||
{
|
|
||||||
return std::make_unique<MWWorld::ActionHarvest>(ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
return std::make_unique<MWWorld::ActionOpen>(ptr);
|
return std::make_unique<MWWorld::ActionOpen>(ptr);
|
||||||
|
|
||||||
|
if (hasToolTip(ptr))
|
||||||
|
return std::make_unique<MWWorld::ActionHarvest>(ptr);
|
||||||
|
|
||||||
|
return std::make_unique<MWWorld::FailedAction>(std::string_view{}, ptr);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue