Skip to content

Commit

Permalink
Revert "pre-resync commit"
Browse files Browse the repository at this point in the history
This reverts commit ae60c4d.
  • Loading branch information
Starwaster committed Oct 9, 2014
1 parent ae60c4d commit 0eadba8
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Source/DeadlyReentry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void SetDamageLabel()
public override void OnAwake()
{
base.OnAwake();
if (!CompatibilityChecker.IsCompatible())
if (!CompatibilityChecker.IsAllCompatible())
{
isCompatible = false;
return;
Expand Down Expand Up @@ -271,7 +271,7 @@ public bool IsShielded(Vector3 direction)
if (GetShieldedStateFromFAR() == true)
return true;

Ray ray = new Ray(part.transform.position + direction.normalized * (1.0f+adjustCollider), direction.normalized);
Ray ray = new Ray(part.transform.position + direction.normalized * (adjustCollider), direction.normalized);
RaycastHit[] hits = Physics.RaycastAll (ray, 10);
foreach (RaycastHit hit in hits) {
if(hit.rigidbody != null && hit.collider != part.collider && hit.collider.attachedRigidbody != part.Rigidbody) {
Expand Down Expand Up @@ -311,7 +311,7 @@ public float ReentryHeat()
{
bool cut = ambient + Math.Pow(density, ReentryPhysics.densityExponent) * shockwave * 10f
> part.maxTemp * ReentryPhysics.parachuteTempMult;
if (cut && (object)parachute != null)
if ((object)parachute != null)
{
ModuleParachute p = parachute;
if (p.deploymentState == ModuleParachute.deploymentStates.DEPLOYED || p.deploymentState == ModuleParachute.deploymentStates.SEMIDEPLOYED)
Expand Down Expand Up @@ -339,13 +339,13 @@ public void FixedUpdate ()
{
if (!HighLogic.LoadedSceneIsFlight || !isCompatible)
return;
Rigidbody rb = part.Rigidbody;
//Rigidbody rb = part.Rigidbody;
deltaTime = TimeWarp.fixedDeltaTime;
density = (float)(part.vessel.staticPressure * 101325 / (287.058 * (part.vessel.flightIntegrator.getExternalTemperature() + CTOK)));
// calc here again, just in case. ReentryPhysics.frameDensity; // close enough

if (!rb || part.physicalSignificance == Part.PhysicalSignificance.NONE)
return;
/*if (!rb || part.physicalSignificance == Part.PhysicalSignificance.NONE)
return;*/

if (is_debugging != ReentryPhysics.debugging)
{
Expand Down Expand Up @@ -690,7 +690,7 @@ public class FixMaxTemps : MonoBehaviour
{
public void Start()
{
if (!CompatibilityChecker.IsCompatible())
if (!CompatibilityChecker.IsAllCompatible())
return;

foreach (ConfigNode node in GameDatabase.Instance.GetConfigNodes ("REENTRY_EFFECTS")) {
Expand Down Expand Up @@ -794,7 +794,7 @@ public static float TemperatureDelta(double density, float shockwaveK, float par

public void Start()
{
if (!CompatibilityChecker.IsCompatible())
if (!CompatibilityChecker.IsAllCompatible())
{
isCompatible = false;
return;
Expand Down

0 comments on commit 0eadba8

Please sign in to comment.