mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 06:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Activate/OnActivate fix (Bug #3712)

Browse Source
This commit is contained in:
scrawl 2017-01-14 00:10:43 +01:00
parent 73aa07b81b
commit 69ce9f32bc
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/openmw/mwworld/refdata.cpp
View File

@ -13,7 +13,8 @@ namespace
enum RefDataFlags enum RefDataFlags
{ {
Flag_SuppressActivate = 1, // If set, activation will be suppressed and redirected to the OnActivate flag, which can then be handled by a script. Flag_SuppressActivate = 1, // If set, activation will be suppressed and redirected to the OnActivate flag, which can then be handled by a script.
Flag_OnActivate = 2 Flag_OnActivate = 2,
Flag_ActivationBuffered = 4
}; };
} }
@ -241,38 +242,32 @@ namespace MWWorld
return mChanged || !mAnimationState.empty(); return mChanged || !mAnimationState.empty();
} }
bool RefData::activateByScript()
{
bool ret = (mFlags & Flag_ActivationBuffered);
mFlags &= ~(Flag_SuppressActivate|Flag_OnActivate);
return ret;
}
bool RefData::activate() bool RefData::activate()
{ {
if (!(mFlags & Flag_SuppressActivate)) if (mFlags & Flag_SuppressActivate)
return true; {
mFlags |= Flag_OnActivate|Flag_ActivationBuffered;
return false;
}
else else
{ {
mFlags |= Flag_OnActivate; return true;
return false;
} }
} }
bool RefData::onActivate() bool RefData::onActivate()
{ {
bool ret = mFlags & Flag_OnActivate;
mFlags |= Flag_SuppressActivate; mFlags |= Flag_SuppressActivate;
mFlags &= (~Flag_OnActivate);
if (mFlags & Flag_OnActivate) return ret;
{
mFlags &= (~Flag_OnActivate);
return true;
}
return false;
}
bool RefData::activateByScript()
{
if (mFlags & Flag_SuppressActivate)
{
mFlags &= (~Flag_SuppressActivate);
return true;
}
else
return false;
} }
const ESM::AnimationState& RefData::getAnimationState() const const ESM::AnimationState& RefData::getAnimationState() const