Skip to content

Commit d1609a7

Browse files
authored
Merge pull request #112 from ModOrganizer2/starfield
Starfield
2 parents f1e5d65 + 58737ac commit d1609a7

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

src/mobase/wrappers/game_features.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ namespace mo2::python {
8989
{
9090
PYBIND11_OVERRIDE_PURE(bool, GamePlugins, lightPluginsAreSupported, );
9191
}
92+
bool overridePluginsAreSupported() override
93+
{
94+
PYBIND11_OVERRIDE_PURE(bool, GamePlugins, overridePluginsAreSupported, );
95+
}
9296
};
9397

9498
class PyLocalSavegames : public LocalSavegames {
@@ -244,7 +248,9 @@ namespace mo2::python {
244248
.def("writePluginLists", &GamePlugins::writePluginLists, "plugin_list"_a)
245249
.def("readPluginLists", &GamePlugins::readPluginLists, "plugin_list"_a)
246250
.def("getLoadOrder", &GamePlugins::getLoadOrder)
247-
.def("lightPluginsAreSupported", &GamePlugins::lightPluginsAreSupported);
251+
.def("lightPluginsAreSupported", &GamePlugins::lightPluginsAreSupported)
252+
.def("overridePluginsAreSupported",
253+
&GamePlugins::overridePluginsAreSupported);
248254

249255
// LocalSavegames
250256

src/mobase/wrappers/pyplugins.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ namespace mo2::python {
2323
void add_iplugingame_bindings(pybind11::module_ m)
2424
{
2525
py::enum_<IPluginGame::LoadOrderMechanism>(m, "LoadOrderMechanism")
26+
.value("None", IPluginGame::LoadOrderMechanism::None)
2627
.value("FileTime", IPluginGame::LoadOrderMechanism::FileTime)
2728
.value("PluginsTxt", IPluginGame::LoadOrderMechanism::PluginsTxt)
2829

30+
.value("NONE", IPluginGame::LoadOrderMechanism::None)
2931
.value("FILE_TIME", IPluginGame::LoadOrderMechanism::FileTime)
3032
.value("PLUGINS_TXT", IPluginGame::LoadOrderMechanism::PluginsTxt);
3133

@@ -66,6 +68,7 @@ namespace mo2::python {
6668
.def("gameIcon", &IPluginGame::gameIcon)
6769
.def("gameDirectory", &IPluginGame::gameDirectory)
6870
.def("dataDirectory", &IPluginGame::dataDirectory)
71+
.def("secondaryDataDirectories", &IPluginGame::secondaryDataDirectories)
6972
.def("setGamePath", &IPluginGame::setGamePath, "path"_a)
7073
.def("documentsDirectory", &IPluginGame::documentsDirectory)
7174
.def("savesDirectory", &IPluginGame::savesDirectory)

src/mobase/wrappers/pyplugins.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,12 @@ namespace mo2::python {
381381
{
382382
PYBIND11_OVERRIDE_PURE(QDir, IPluginGame, dataDirectory, );
383383
}
384+
QMap<QString, QDir> secondaryDataDirectories() const override
385+
{
386+
using string_dir_map = QMap<QString, QDir>;
387+
PYBIND11_OVERRIDE_PURE(string_dir_map, IPluginGame,
388+
secondaryDataDirectories, );
389+
}
384390
void setGamePath(const QString& path) override
385391
{
386392
PYBIND11_OVERRIDE_PURE(void, IPluginGame, setGamePath, path);

0 commit comments

Comments
 (0)