mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-09 04:15:40 -04:00
Don't harvest if player activation is blocked (#8612)
This commit is contained in:
parent
f5de0d1c40
commit
fe7970421f
@ -192,12 +192,13 @@ namespace MWClass
|
|||||||
{
|
{
|
||||||
if (!isTrapped)
|
if (!isTrapped)
|
||||||
{
|
{
|
||||||
if (canBeHarvested(ptr))
|
if (!canBeHarvested(ptr))
|
||||||
{
|
return std::make_unique<MWWorld::ActionOpen>(ptr);
|
||||||
return std::make_unique<MWWorld::ActionHarvest>(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…
x
Reference in New Issue
Block a user