Merge pull request #6 from Telanor/master

Replaced ModuleScienceContainer casts with IScienceDataContainer
PapaJoesSoup · Jul 29, 2014 · 3d5918a · 3d5918a
2 parents 75d887d + ca46735
commit 3d5918a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ShipManifest/TransferController.cs b/ShipManifest/TransferController.cs
@@ -206,12 +206,12 @@ private void SourceDetailsViewer()
                             int capacity = 0;
                             if (pm is ModuleScienceContainer)
                             {
-                                scienceCount = ((ModuleScienceContainer)pm).GetScienceCount();
+						   scienceCount = ((IScienceDataContainer)pm).GetScienceCount();
                                 capacity = ((ModuleScienceContainer)pm).capacity;
                             }
                             else if (pm is ModuleScienceExperiment)
                             {
-                                scienceCount = ((ModuleScienceExperiment)pm).GetScienceCount();
+						   scienceCount = ((IScienceDataContainer)pm).GetScienceCount();
                                 capacity = 1;
                             }
 
@@ -420,7 +420,7 @@ private void TargetDetailsViewer()
                             int scienceCount = 0;
                             if (pm is ModuleScienceContainer)
                             {
-                                scienceCount = ((ModuleScienceContainer)pm).GetScienceCount();
+						   scienceCount = ((IScienceDataContainer)pm).GetScienceCount();
                                 GUILayout.BeginHorizontal();
                                 GUILayout.Label(string.Format("{0} - ({1})", pm.moduleName, scienceCount.ToString()), GUILayout.Width(205), GUILayout.Height(20));
                                 // set the conditions for a button style change.
@@ -784,12 +784,12 @@ private int GetScienceCount(Part part, bool IsCapacity)
                     // Containers.
                     if (pm is ModuleScienceContainer)
                     {
-                        scienceCount += ((ModuleScienceContainer)pm).GetScienceCount();
+					scienceCount += ((IScienceDataContainer)pm).GetScienceCount();
                         capacity += ((ModuleScienceContainer)pm).capacity;
                     }
                     else if (pm is ModuleScienceExperiment)
                     {
-                        scienceCount += ((ModuleScienceExperiment)pm).GetScienceCount();
+					scienceCount += ((IScienceDataContainer)pm).GetScienceCount();
                         capacity += 1;
                     }
                 }