Merge branch 'atys' into yubo

fix_opengl_on_mac
Ulukyn 5 years ago
commit 435b4362d3

@ -456,10 +456,10 @@ void CGameContextMenu::update()
fameValue = pLeafFame->getValue8(); fameValue = pLeafFame->getValue8();
} }
if (_TextNews) if (_TextNews)
_TextNews->setActive(selection && !canAttack() && !selection->isForageSource() && fameValue >= -30); _TextNews->setActive(selection && !canAttack() && selection->isNPC() && fameValue >= -30);
if (_TextNewsAgressive) if (_TextNewsAgressive)
_TextNewsAgressive->setActive(selection && !canAttack() && !selection->isForageSource() && fameValue < -30); _TextNewsAgressive->setActive(selection && !canAttack() && selection->isNPC() && fameValue < -30);
if (_TextDuel && _TextUnDuel) if (_TextDuel && _TextUnDuel)

Loading…
Cancel
Save