dkanus
/
Acedia
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Change `Feature` loading to support new AcediaCore

new
Anton Tarasenko 3 years ago
parent
280cf5af57
commit
e2eedc1d28
1 changed files with 12 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      sources/Packages.uc

26
sources/Packages.uc
Unescape View File

@ -133,7 +133,7 @@ private final function LoadManifest(class<_manifest> manifestClass)
_.memory.Allocate(manifestClass.default.aliasSources[i]); _.memory.Allocate(manifestClass.default.aliasSources[i]);
} }
LaunchServicesAndFeatures(manifestClass); LaunchServicesAndFeatures(manifestClass);
if (class'Commands'.static.IsEnabled()) { if (class'Commands_Feature'.static.IsEnabled()) {
RegisterCommands(manifestClass); RegisterCommands(manifestClass);
} }
for (i = 0; i < manifestClass.default.testCases.length; i += 1) for (i = 0; i < manifestClass.default.testCases.length; i += 1)
@ -146,8 +146,9 @@ private final function LoadManifest(class<_manifest> manifestClass)
private final function RegisterCommands(class<_manifest> manifestClass) private final function RegisterCommands(class<_manifest> manifestClass)
{ {
local int i; local int i;
local Commands commandsFeature; local Commands_Feature commandsFeature;
commandsFeature = Commands(class'Commands'.static.GetInstance()); commandsFeature =
Commands_Feature(class'Commands_Feature'.static.GetInstance());
for (i = 0; i < manifestClass.default.commands.length; i += 1) for (i = 0; i < manifestClass.default.commands.length; i += 1)
{ {
if (manifestClass.default.commands[i] == none) continue; if (manifestClass.default.commands[i] == none) continue;
@ -158,16 +159,7 @@ private final function RegisterCommands(class<_manifest> manifestClass)
private final function LaunchServicesAndFeatures(class<_manifest> manifestClass) private final function LaunchServicesAndFeatures(class<_manifest> manifestClass)
{ {
local int i; local int i;
local bool packageFeaturesAreUsed; local Text autoConfigName;
for (i = 0; i < manifestClass.default.features.length; i += 1)
{
if (manifestClass.default.features[i] == none) continue;
if (manifestClass.default.features[i].static.IsAutoEnabled())
{
packageFeaturesAreUsed = true;
break;
}
}
// Services // Services
for (i = 0; i < manifestClass.default.services.length; i += 1) for (i = 0; i < manifestClass.default.services.length; i += 1)
{ {
@ -178,9 +170,13 @@ private final function LaunchServicesAndFeatures(class<_manifest> manifestClass)
for (i = 0; i < manifestClass.default.features.length; i += 1) for (i = 0; i < manifestClass.default.features.length; i += 1)
{ {
if (manifestClass.default.features[i] == none) continue; if (manifestClass.default.features[i] == none) continue;
if (manifestClass.default.features[i].static.IsAutoEnabled()) { manifestClass.default.features[i].static.StaticConstructor();
manifestClass.default.features[i].static.EnableMe(); autoConfigName =
manifestClass.default.features[i].static.GetAutoEnabledConfig();
if (autoConfigName != none) {
manifestClass.default.features[i].static.EnableMe(autoConfigName);
} }
_.memory.Free(autoConfigName);
} }
} }