Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Kopernicus/Kopernicus
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 997693711b4d
Choose a base ref
...
head repository: Kopernicus/Kopernicus
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a8a80bd3bfc2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 15, 2017

  1. Fix FPS madness

    Dorian Stoll committed Mar 15, 2017
    Copy the full SHA
    36f2318 View commit details
  2. Make the PQSLoader a bit safer regarding custom pqs mods

    Dorian Stoll committed Mar 15, 2017
    Copy the full SHA
    a8a80bd View commit details
Showing with 7 additions and 3 deletions.
  1. +2 −3 Kopernicus/Kopernicus/Configuration/PQSLoader.cs
  2. +5 −0 Kopernicus/Kopernicus/RuntimeUtility/RuntimeUtility.cs
5 changes: 2 additions & 3 deletions Kopernicus/Kopernicus/Configuration/PQSLoader.cs
Original file line number Diff line number Diff line change
@@ -364,11 +364,10 @@ void IParserEventSubscriber.PostApply(ConfigNode node)
if (types.Count(t => t.Name == mod.name) == 0)
continue;
Type loaderType = types.FirstOrDefault(t => t.Name == mod.name);
string testName = mod.name != "LandControl" ? "PQSMod_" + mod.name : "PQSLandControl";
Type modType = types.FirstOrDefault(t => t.Name == testName);
Type modType = loaderType.BaseType.GetGenericArguments()[0];
if (loaderType == null || modType == null)
{
Debug.LogError("MOD NULL: Loadertype " + mod.name + " with mod type " + testName + " and null? " + (loaderType == null) + (modType == null));
Debug.LogError("MOD NULL: Loadertype " + mod.name + " with mod type " + modType.Name + " and null? " + (loaderType == null) + (modType == null));
continue;
}
// Do any PQS Mods already exist on this PQS matching this mod?
5 changes: 5 additions & 0 deletions Kopernicus/Kopernicus/RuntimeUtility/RuntimeUtility.cs
Original file line number Diff line number Diff line change
@@ -480,6 +480,11 @@ void RDFixer()
// Waaah
foreach (RDArchivesController controller in Resources.FindObjectsOfTypeAll<RDArchivesController>())
controller.gameObject.AddOrGetComponent<RnDFixer>();
isDone2 = true;
}
else
{
isDone2 = false;
}
}