Merge branch 'pre4-testing' of https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source into pre4-testing

Author: fourZK

Entities/Turret.cpp

@@ -30,6 +30,14 @@ namespace RTE {
 		return 0;
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void Turret::Destroy(bool notInherited) {
+		if (!notInherited) { Attachable::Destroy(); }
+		for (const HeldDevice *mountedDevice : m_MountedDevices) { m_HardcodedAttachableUniqueIDsAndRemovers.erase(mountedDevice->GetUniqueID()); }
+		Clear();
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	int Turret::ReadProperty(const std::string_view &propName, Reader &reader) {
@@ -121,6 +129,15 @@ namespace RTE {
 		}
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    void Turret::SetParent(MOSRotating *newParent) {
+		Attachable::SetParent(newParent);
+		for (HeldDevice *mountedDevice : m_MountedDevices) {
+			mountedDevice->Deactivate(); //mountedDevice->Reloading = false; m_ReloadTmr.Reset();
+		}
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void Turret::RemoveMountedDevice(const HeldDevice *mountedDeviceToRemove) {

Entities/Turret.h

@@ -42,7 +42,7 @@ namespace RTE {
 		/// Destroys and resets (through Clear()) the Turret object.
 		/// </summary>
 		/// <param name="notInherited">Whether to only destroy the members defined in this derived class, or to destroy all inherited members also.</param>
-		void Destroy(bool notInherited = false) override { if (!notInherited) { Attachable::Destroy(); } Clear(); }
+		void Destroy(bool notInherited = false) override;
 
 		/// <summary>
 		/// Resets the entire Turret, including its inherited members, to their default settings or values.
@@ -114,12 +114,19 @@ namespace RTE {
 
 	protected:
 
+		/// <summary>
+		/// Sets this Attachable's parent MOSRotating, and also sets its Team based on its parent and, if the Attachable is set to collide, adds/removes Atoms to its new/old parent.
+		/// Additionally, deactivates all MountedDevices.
+		/// </summary>
+		/// <param name="newParent">A pointer to the MOSRotating to set as the new parent. Ownership is NOT transferred!</param>
+		void SetParent(MOSRotating *newParent) override;
+
 		static Entity::ClassInfo m_sClass; //!< ClassInfo for this class.
 
 	private:
 
 		//TODO I think things would be cleaner if this (and all hardcoded attachable pointers) used weak_ptrs. It would solve some weird ownership stuff, particularly with this. However, for that to be possible, m_Attachables has to be shared_ptrs though.
-		std::vector<HeldDevice *> m_MountedDevices; //!< Vector of unique_ptrs to the mounted HeldDevices of this Turret, if any. Owned here.
+		std::vector<HeldDevice *> m_MountedDevices; //!< Vector of pointers to the mounted HeldDevices of this Turret, if any. Owned here.
 		float m_MountedDeviceRotationOffset; //!< The relative offset angle (in radians) of the mounted HeldDevice from this Turret's rotation.
 
 		/// <summary>

Menus/MetagameGUI.cpp

@@ -1096,36 +1096,25 @@ bool MetagameGUI::StartNewGame()
                 g_MetaMan.m_TeamCount++;
             }
 
-            // Get the tech selection and apply it to the metaplayer
-            GUIListPanel::Item *pTechItem = m_apPlayerTechSelect[player]->GetSelectedItem();
-            if (pTechItem)
-            {
-                // If the "random" selection, choose one from the list of loaded techs
-                if (m_apPlayerTechSelect[player]->GetSelectedIndex() <= 0)//pTechItem->m_ExtraIndex < 0)
-                {
-                    int selection = RandomNum<int>(1, m_apPlayerTechSelect[player]->GetListPanel()->GetItemList()->size() - 1);
-					
-					// Don't let the game to chose the same faction twice
+			if (const GUIListPanel::Item *selectedTech = m_apPlayerTechSelect[player]->GetSelectedItem()) {
+				// If the "random" selection, choose one from the list of loaded techs.
+				if (m_apPlayerTechSelect[player]->GetSelectedIndex() <= 0) {
+					int randomSelection = 0;
+
+					// Don't let the game to chose the same faction twice.
 					bool ok = false;
-					while (!ok)
-					{
+					while (!ok) {
+						randomSelection = RandomNum<int>(1, m_apPlayerTechSelect[player]->GetListPanel()->GetItemList()->size() - 1);
 						ok = true;
-						selection = RandomNum<int>(1, m_apPlayerTechSelect[player]->GetListPanel()->GetItemList()->size() - 1);
-
-						for (int p = 0; p < player; p++)
-							if (selection == m_apPlayerTechSelect[p]->GetSelectedIndex())
-								ok = false;
+						for (int p = 0; p < player; p++) {
+							if (randomSelection == m_apPlayerTechSelect[p]->GetSelectedIndex()) { ok = false; }
+						}
 					}
+					selectedTech = m_apPlayerTechSelect[player]->GetItem(randomSelection);
+				}
+				if (selectedTech) { newPlayer.m_NativeTechModule = selectedTech->m_ExtraIndex; }
+			}
 
-                    m_apPlayerTechSelect[player]->SetSelectedIndex(selection);
-                    pTechItem = m_apPlayerTechSelect[player]->GetSelectedItem();
-                }
-
-                // Now set the selected tech's module index as what the metaplayer is going to use
-                if (pTechItem)
-                    newPlayer.m_NativeTechModule = pTechItem->m_ExtraIndex;
-            }
-            
             // Set the starting brains for this player
             // Start with the baseline setting
             newPlayer.m_BrainPool = m_pLengthSlider->GetValue();

Menus/ScenarioActivityConfigGUI.cpp

@@ -212,8 +212,7 @@ namespace RTE {
 				if (techItem->m_ExtraIndex == -2) {
 					gameActivity->SetTeamTech(team, "-All-");
 				} else if (techItem->m_ExtraIndex == -1) {
-					m_TeamTechComboBoxes.at(team)->SetSelectedIndex(RandomNum<int>(2, m_TeamTechComboBoxes.at(team)->GetListPanel()->GetItemList()->size() - 1));
-					gameActivity->SetTeamTech(team, g_PresetMan.GetDataModuleName(m_TeamTechComboBoxes.at(team)->GetSelectedItem()->m_ExtraIndex));
+					gameActivity->SetTeamTech(team, g_PresetMan.GetDataModuleName(m_TeamTechComboBoxes.at(team)->GetItem(RandomNum<int>(2, m_TeamTechComboBoxes.at(team)->GetListPanel()->GetItemList()->size() - 1))->m_ExtraIndex));
 				} else {
 					gameActivity->SetTeamTech(team, g_PresetMan.GetDataModuleName(techItem->m_ExtraIndex));
 				}