Skip to content

Addresses issues with PapyrusActorValueInfo::GetPerk.* implementation. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sky-void0 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Addresses issues with PapyrusActorValueInfo::GetPerk.* implementation. #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16e43e9
Fixes stack overflow caused by recursing over ill-formed perk tree.
Apr 11, 2024
0acceac
Prevents duplicate perks in the resulting VMArray
Apr 11, 2024
4888873
Simplifies the logic of the perk traversal code.
Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions skse64/GameFormComponents.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ class BGSSkillPerkTreeNode
virtual bool Accept(BGSPerk * node) = 0;
};

bool VisitPerks(PerkVisitor & visitor)
bool VisitPerks(PerkVisitor & visitor, const int depth = 0)
{
if(visitor.Accept(perk))
return true;
Expand All @@ -1342,7 +1342,7 @@ class BGSSkillPerkTreeNode
BGSSkillPerkTreeNode* connector = NULL;
connections.GetNthItem(i, connector);

if(connector->VisitPerks(visitor))
if(depth < 32 && connector->VisitPerks(visitor, depth + 1))
return true;
}

Expand Down
56 changes: 25 additions & 31 deletions skse64/PapyrusActorValueInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,19 @@ class MatchSkillPerks : public BGSSkillPerkTreeNode::PerkVisitor

virtual bool Accept(BGSPerk * perk)
{
if(perk)
if(perk && !GetPerkAdded(perk))
{
bool addPerk = true;
if(m_actor) {
if(!CALL_MEMBER_FN(m_actor, HasPerk)(perk))
addPerk = m_unowned;
else
addPerk = !m_unowned;
}

if(addPerk) {
AddPerk(perk);
}

if(m_allRanks) {
BGSPerk * nextPerk = perk->nextPerk;
while(nextPerk) {
addPerk = true;
if(m_actor) {
if(!CALL_MEMBER_FN(m_actor, HasPerk)(nextPerk))
addPerk = m_unowned;
else
addPerk = !m_unowned;
}

if(addPerk) {
AddPerk(nextPerk);
}

nextPerk = nextPerk->nextPerk;
}
}
do
{ if (!m_actor || (!CALL_MEMBER_FN(m_actor, HasPerk)(perk) ? m_unowned : !m_unowned) )
AddPerk(perk);
perk = m_allRanks ? perk->nextPerk : nullptr;
} while (perk);
}

return false;
}
virtual void AddPerk(BGSPerk * perk) = 0;
virtual bool GetPerkAdded(BGSPerk *perk) = 0;
};

class PerkFormListVisitor : public MatchSkillPerks
Expand All @@ -67,6 +43,13 @@ class PerkFormListVisitor : public MatchSkillPerks
{
CALL_MEMBER_FN(m_formList, AddFormToList)(perk);
}

virtual bool GetPerkAdded(BGSPerk *perk)
{
TESForm *base = perk;

return ((*m_formList).forms.GetItemIndex(base) > -1);
}
};

class PerkArrayVisitor : public MatchSkillPerks
Expand All @@ -81,6 +64,17 @@ class PerkArrayVisitor : public MatchSkillPerks
{
m_perks->push_back(perk);
}
virtual bool GetPerkAdded(BGSPerk *perk)
{
std::vector<BGSPerk*>::const_iterator offbounds = (*m_perks).cend();

for (std::vector<BGSPerk*>::const_iterator i = (*m_perks).cbegin(); i != offbounds; ++i)
{ if (*i != perk)
continue ;
return (true);
}
return (false);
}
};

namespace papyrusActorValueInfo
Expand Down