pre-resync commit

Commiting prior to re-rebasing.
Starwaster · Oct 9, 2014 · ae60c4d · ae60c4d
1 parent 926e930
commit ae60c4d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Source/DeadlyReentry.cs b/Source/DeadlyReentry.cs
@@ -192,7 +192,7 @@ public void SetDamageLabel()
         public override void OnAwake()
         {
             base.OnAwake();
-            if (!CompatibilityChecker.IsAllCompatible())
+            if (!CompatibilityChecker.IsCompatible())
             {
                 isCompatible = false;
                 return;
@@ -271,7 +271,7 @@ public bool IsShielded(Vector3 direction)
             if (GetShieldedStateFromFAR() == true)
             	return true;
 
-            Ray ray = new Ray(part.transform.position + direction.normalized * (adjustCollider), direction.normalized);
+            Ray ray = new Ray(part.transform.position + direction.normalized * (1.0f+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) {
@@ -311,7 +311,7 @@ public float ReentryHeat()
                 {
                     bool cut = ambient + Math.Pow(density, ReentryPhysics.densityExponent) * shockwave * 10f
                     > part.maxTemp * ReentryPhysics.parachuteTempMult;
-                    if ((object)parachute != null)
+                    if (cut && (object)parachute != null)
                     {
                         ModuleParachute p = parachute;
                         if (p.deploymentState == ModuleParachute.deploymentStates.DEPLOYED || p.deploymentState == ModuleParachute.deploymentStates.SEMIDEPLOYED)
@@ -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)
 			{
@@ -690,7 +690,7 @@ public class FixMaxTemps : MonoBehaviour
 	{
 		public void Start()
 		{
-            if (!CompatibilityChecker.IsAllCompatible())
+            if (!CompatibilityChecker.IsCompatible())
                 return;
 
 			foreach (ConfigNode node in GameDatabase.Instance.GetConfigNodes ("REENTRY_EFFECTS")) {
@@ -794,7 +794,7 @@ public static float TemperatureDelta(double density, float shockwaveK, float par
 
 		public void Start()
 		{
-            if (!CompatibilityChecker.IsAllCompatible())
+            if (!CompatibilityChecker.IsCompatible())
             {
                 isCompatible = false;
                 return;