Skip to content

Commit

Permalink
Fix so RPM compiles with KSP 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MOARdV committed May 26, 2017
1 parent 8da5d1e commit 631758a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void Start()
rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);

textObjTransform = internalProp.FindModelTransform(labelTransform);
textObj = InternalComponents.Instance.CreateText(fontName, fontSize * 15.5f, textObjTransform, string.Empty);
textObj = InternalComponents.Instance.CreateText(fontName, fontSize * 15.5f, textObjTransform);
activeLabel = 0;

SmarterButton.CreateButton(internalProp, switchTransform, Click);
Expand Down
2 changes: 1 addition & 1 deletion RasterPropMonitor/Auxiliary modules/JSIVariableLabel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void Start()
rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);

Transform textObjTransform = internalProp.FindModelTransform(transformName);
textObj = InternalComponents.Instance.CreateText("Arial", fontSize * 15.5f, textObjTransform, string.Empty);
textObj = InternalComponents.Instance.CreateText("Arial", fontSize * 15.5f, textObjTransform);
// Force oneshot if there's no variables:
oneshot |= !labelText.Contains("$&$");
string sourceString = labelText.UnMangleConfigText();
Expand Down
14 changes: 7 additions & 7 deletions RasterPropMonitor/Core/UtilityFunctions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1081,31 +1081,31 @@ public static string CurrentBiome(this Vessel thatVessel)
//ExperimentSituations.SrfLanded
case Vessel.Situations.LANDED:
case Vessel.Situations.PRELAUNCH:
return thatVessel.mainBody.theName + "'s " + (biome == "" ? "surface" : biome);
return thatVessel.mainBody.bodyName + "'s " + (biome == "" ? "surface" : biome);
//ExperimentSituations.SrfSplashed
case Vessel.Situations.SPLASHED:
return thatVessel.mainBody.theName + "'s " + (biome == "" ? "oceans" : biome);
return thatVessel.mainBody.bodyName + "'s " + (biome == "" ? "oceans" : biome);
case Vessel.Situations.FLYING:
if (thatVessel.altitude < thatVessel.mainBody.scienceValues.flyingAltitudeThreshold)
{
//ExperimentSituations.FlyingLow
return "Flying over " + thatVessel.mainBody.theName + (biome == "" ? "" : "'s " + biome);
return "Flying over " + thatVessel.mainBody.bodyName + (biome == "" ? "" : "'s " + biome);
}
//ExperimentSituations.FlyingHigh
return "Upper atmosphere of " + thatVessel.mainBody.theName + (biome == "" ? "" : "'s " + biome);
return "Upper atmosphere of " + thatVessel.mainBody.bodyName + (biome == "" ? "" : "'s " + biome);
default:
if (thatVessel.altitude < thatVessel.mainBody.scienceValues.spaceAltitudeThreshold)
{
//ExperimentSituations.InSpaceLow
return "Space just above " + thatVessel.mainBody.theName;
return "Space just above " + thatVessel.mainBody.bodyName;
}
// ExperimentSituations.InSpaceHigh
return "Space high over " + thatVessel.mainBody.theName;
return "Space high over " + thatVessel.mainBody.bodyName;
}
}
catch { }

return "Space over " + thatVessel.mainBody.theName;
return "Space over " + thatVessel.mainBody.bodyName;
}


Expand Down

0 comments on commit 631758a

Please sign in to comment.