Skip to content
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.

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

Fix FIXABLE status for ModDataChecker. #2080

Merged
merged 2 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 13 additions & 5 deletions src/game_features.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,29 @@ class GameFeatures::CombinedModDataChecker : public ModDataChecker
{
m_fixer = nullptr;

for (auto& modDataChecker : m_modDataCheckers) {
// go through the available mod-data checker, if any returns valid, we also
// return valid, otherwise, return the first one that is fixable
for (const auto& modDataChecker : m_modDataCheckers) {
auto check = modDataChecker->dataLooksValid(fileTree);

switch (check) {
case CheckReturn::FIXABLE:
m_fixer = modDataChecker;
[[fallthrough]];
// only update fixer if there is not one with higher priority
if (!m_fixer) {
m_fixer = modDataChecker;
}
break;
case CheckReturn::VALID:
// clear fixer if one were found before and return VALID, not mandatory
// but cleaner
m_fixer = nullptr;
return CheckReturn::VALID;
case CheckReturn::INVALID:
break;
}
}
return CheckReturn::INVALID;

return m_fixer ? CheckReturn::FIXABLE : CheckReturn::INVALID;
}

std::shared_ptr<MOBase::IFileTree>
Expand Down Expand Up @@ -100,7 +109,6 @@ class GameFeatures::CombinedModDataContent : public ModDataContent
std::make_move_iterator(contents.end()));

// increase offset for next mod data content

offset += contents.size();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gamefeaturesproxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ bool GameFeaturesProxy::registerFeature(MOBase::IPluginGame* game,
bool GameFeaturesProxy::registerFeature(std::shared_ptr<MOBase::GameFeature> feature,
int priority, bool replace)
{
return registerFeature({}, feature, priority, replace);
return registerFeature(QStringList(), feature, priority, replace);
}

bool GameFeaturesProxy::unregisterFeature(std::shared_ptr<MOBase::GameFeature> feature)
Expand Down
Loading