Max/PDModdingCommunity_PD-Loader
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 5 Wiki Activity

don't use vector for GetPluginOptions (usable with other languages now)

Browse Source
This commit is contained in:
somewhatlurker
2019-08-30 00:16:35 +10:00
parent be8572d20c
commit 38f17ce692
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/plugins/Launcher/PluginConfig.h
+7 -3
View File
@@ -40,12 +40,16 @@ namespace PluginConfig
}
}
std::vector<ConfigOptionBase*> GetConfigOptionVec(std::vector<PluginConfigOption> &in)
std::vector<ConfigOptionBase*> GetConfigOptionVec(PluginConfigArray &in)
{
std::vector<ConfigOptionBase*> outvec;
for (PluginConfigOption &opt : in)
for (int i = 0; i < in.len; i++)
{
outvec.push_back(GetConfigOption(opt));
// basic check for validity
if (in.options[i].data == nullptr)
break;
outvec.push_back(GetConfigOption(in.options[i]));
}
return outvec;
}
source-code/source/plugins/Launcher/PluginConfigApi.h
+6
View File
@@ -144,4 +144,10 @@ namespace PluginConfig
ConfigType cfgType;
void* data;
};
struct PluginConfigArray
{
int len;
PluginConfigOption* options;
};
}
source-code/source/plugins/Launcher/framework.h
+1 -1
View File
@@ -303,7 +303,7 @@ std::vector<PluginInfo> LoadPlugins()
auto nameFunc = (LPCWSTR(*)())GetProcAddress(thisplugin.handle, "GetPluginName");
auto descFunc = (LPCWSTR(*)())GetProcAddress(thisplugin.handle, "GetPluginDescription");
auto optsFunc = (std::vector<PluginConfig::PluginConfigOption>(*)())GetProcAddress(thisplugin.handle, "GetPluginOptions");
auto optsFunc = (PluginConfig::PluginConfigArray(*)())GetProcAddress(thisplugin.handle, "GetPluginOptions");
if (nameFunc != NULL)
thisplugin.name = nameFunc();