Skip to content

Commit a385bd4

Browse files
authored
Merge pull request #1080 from PlayEveryWare/feat/apply-default-platformintegratedmanagementflags
feat: Enable PlatformConfigs to Provide Default `IntegratedPlatformManagementFlags`
2 parents 2d53fda + d0dcc52 commit a385bd4

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

com.playeveryware.eos/Runtime/Core/Config/PlatformConfig.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,15 @@ protected virtual void MigrateNonOverrideableConfigValues(EOSConfig overrideValu
412412

413413
MigratePlatformFlags(overrideValuesFromFieldMember, mainNonOverrideableConfig);
414414

415-
integratedPlatformManagementFlags = IntegratedPlatformManagementFlags.Disabled;
416-
integratedPlatformManagementFlags |= mainNonOverrideableConfig.integratedPlatformManagementFlags;
415+
// If there are no Integrated Platform Management Flags in the original config, apply a set of default per-platform IMPFs
416+
if ((int)mainNonOverrideableConfig.integratedPlatformManagementFlags == 0 || mainNonOverrideableConfig.integratedPlatformManagementFlags == IntegratedPlatformManagementFlags.Disabled)
417+
{
418+
integratedPlatformManagementFlags = GetDefaultIntegratedPlatformManagementFlags();
419+
}
420+
else
421+
{
422+
integratedPlatformManagementFlags = mainNonOverrideableConfig.integratedPlatformManagementFlags;
423+
}
417424

418425
ProductConfig productConfig = Get<ProductConfig>();
419426
string compDeploymentString = mainNonOverrideableConfig.deploymentID?.ToLower();
@@ -612,7 +619,12 @@ protected override void MigrateConfig()
612619
"Plugin -> EOS Configuration to make sure that the " +
613620
"migration was successful.");
614621
}
615-
622+
623+
public virtual IntegratedPlatformManagementFlags GetDefaultIntegratedPlatformManagementFlags()
624+
{
625+
return IntegratedPlatformManagementFlags.Disabled;
626+
}
627+
616628

617629
#endif
618630

0 commit comments

Comments
 (0)