Subpulse and PD list bug fixes

these were breaking under certain circumstances.
Pulsar4xDevs · Nov 11, 2014 · d491a66 · d491a66
1 parent abb4232
commit d491a66
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/Pulsar4X/Pulsar4X.Lib/Entities/SimEntity.cs b/Pulsar4X/Pulsar4X.Lib/Entities/SimEntity.cs
@@ -281,6 +281,9 @@ public int SubpulseHandler(BindingList<Faction> P, Random RNG, int tickValue)
                     int FiveSecondIncrements = (int)Math.Floor((float)MissileTimeToHit / 5.0f);
                     desiredTime = FiveSecondIncrements * 5;
 
+                    if (desiredTime == 0)
+                        desiredTime = (int)Constants.TimeInSeconds.FiveSeconds;
+
                     /// <summary>
                     /// I want to pause right before the missile hits.
                     /// </summary>

diff --git a/Pulsar4X/Pulsar4X.UI/Handlers/Ships.cs b/Pulsar4X/Pulsar4X.UI/Handlers/Ships.cs
@@ -520,18 +520,26 @@ private void SetPDModeButton_Click(object sender, EventArgs e)
                         /// <summary>
                         /// Remove the FC from the point defense FC list.
                         /// </summary>
-                        if (_CurrnetFaction.PointDefense[CurrentSystem].PointDefenseFC.ContainsKey(_CurrnetShip.ShipMFC[_CurrnetFC.componentIndex]) == true)
+                        if (_CurrnetFaction.PointDefense.Count != 0)
                         {
-                            _CurrnetFaction.PointDefense[CurrentSystem].RemoveComponent(_CurrnetShip.ShipMFC[_CurrnetFC.componentIndex]);
-                        }
+                            if(_CurrnetFaction.PointDefense.ContainsKey(CurrentSystem) == true)
+                            {
+                                if (_CurrnetFaction.PointDefense[CurrentSystem].PointDefenseFC.ContainsKey(_CurrnetShip.ShipMFC[_CurrnetFC.componentIndex]) == true)
+                                {
+                                    _CurrnetFaction.PointDefense[CurrentSystem].RemoveComponent(_CurrnetShip.ShipMFC[_CurrnetFC.componentIndex]);
+                                }
 
-                        /// <summary>
-                        /// cleanup the starsystem so that the point defense list isn't cluttered.
-                        /// </summary>
-                        if (_CurrnetFaction.PointDefense[CurrentSystem].PointDefenseFC.Count == 0)
-                        {
-                            _CurrnetFaction.PointDefense.Remove(CurrentSystem);
+                                /// <summary>
+                                /// Cleanup the starsystem so that the point defense list isn't cluttered.
+                                /// </summary>
+                                if (_CurrnetFaction.PointDefense[CurrentSystem].PointDefenseFC.Count == 0)
+                                {
+                                    _CurrnetFaction.PointDefense.Remove(CurrentSystem);
+                                }
+                            }
                         }
+
+
                     }
                 }
                 else