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

Author: Causeless

CHANGELOG.md

@@ -12,6 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `Lerp` can now be used on Vectors and Matrices/Rotations, not just numbers.
 
+- Added `HDFirearm` lua bindings `EjectionOffset` (R/W) and `EjectionPos` (R). Work similarly to their Muzzle variants.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -60,6 +62,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed Decision Day camera potentially getting stuck at the start if player 1 wasn't present.
 
+- Fixed Conquest tech selection dropdown getting repeatedly repopulated with duplicated entries, which could cause a crash.
+
 </details>
 
 <details><summary><b>Removed</b></summary>

Source/Entities/HDFirearm.cpp

@@ -531,6 +531,10 @@ Vector HDFirearm::GetMuzzlePos() const {
 	return m_Pos + RotateOffset(m_MuzzleOff);
 }
 
+Vector HDFirearm::GetEjectionPos() const {
+	return m_Pos + RotateOffset(m_EjectOff);
+}
+
 void HDFirearm::RestDetection() {
 	HeldDevice::RestDetection();
 

Source/Entities/HDFirearm.h

@@ -273,9 +273,23 @@ namespace RTE {
 
 		/// Sets the unrotated relative offset from the position to the muzzle or
 		/// other equivalent point of this.
-		/// @param newOffset Bew ofsset value.
+		/// @param newOffset New offset value.
 		void SetMuzzleOffset(Vector newOffset) override { m_MuzzleOff = newOffset; }
 
+		/// Gets the absolute position of the Shell ejection point.
+		/// @return A vector describing the absolute world coordinates for the Shell
+		/// ejection point of this
+		Vector GetEjectionPos() const;
+
+		/// Gets the unrotated relative offset from the position to the Shell ejection point.
+		/// @return A unrotated vector describing the relative for the Shell ejection point of
+		/// this from this' position.
+		Vector GetEjectionOffset() const { return m_EjectOff; }
+
+		/// Sets the unrotated relative offset from the position to the Shell ejection point.
+		/// @param newOffset New offset value.
+		void SetEjectionOffset(Vector newOffset) { m_EjectOff = newOffset; }
+
 		/// Gets this HDFirearm's pre fire sound. Ownership is NOT transferred!
 		/// @return The SoundContainer for this HDFirearm's pre fire sound.
 		SoundContainer* GetPreFireSound() const { return m_PreFireSound; }

Source/Lua/LuaBindingsEntities.cpp

@@ -607,6 +607,8 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, HDFirearm) {
 	return ConcreteTypeLuaClassDefinition(HDFirearm, HeldDevice)
 
 	    .property("ReloadEndOffset", &HDFirearm::GetReloadEndOffset, &HDFirearm::SetReloadEndOffset)
+	    .property("EjectionPos", &HDFirearm::GetEjectionPos)
+	    .property("EjectionOffset", &HDFirearm::GetEjectionOffset, &HDFirearm::SetEjectionOffset)
 	    .property("RateOfFire", &HDFirearm::GetRateOfFire, &HDFirearm::SetRateOfFire)
 	    .property("MSPerRound", &HDFirearm::GetMSPerRound)
 	    .property("FullAuto", &HDFirearm::IsFullAuto, &HDFirearm::SetFullAuto)

Source/Menus/MetagameGUI.cpp

@@ -582,6 +582,7 @@ int MetagameGUI::Create(Controller* pController) {
 
 	// Hide all screens, the appropriate screen will reappear on next update
 	HideAllScreens();
+	m_TechAndFlagListFetched = false;
 	return 0;
 }
 
@@ -717,33 +718,43 @@ void MetagameGUI::SetEnabled(bool enable) {
 		g_GUISound.ExitMenuSound()->Play();
 	}
 
-	// Populate the tech comboboxes with the available tech modules
-	for (int team = Activity::Teams::TeamOne; team < Activity::Teams::MaxTeamCount; ++team) {
-		m_apPlayerTechSelect[team]->GetListPanel()->AddItem("-Random-", "", nullptr, nullptr, -1);
-		m_apPlayerTechSelect[team]->SetSelectedIndex(0);
-	}
-	for (int moduleID = 0; moduleID < g_PresetMan.GetTotalModuleCount(); ++moduleID) {
-		if (const DataModule* dataModule = g_PresetMan.GetDataModule(moduleID)) {
-			if (dataModule->IsFaction()) {
-				for (int team = Activity::Teams::TeamOne; team < Activity::Teams::MaxTeamCount; ++team) {
-					m_apPlayerTechSelect[team]->GetListPanel()->AddItem(dataModule->GetFriendlyName(), "", nullptr, nullptr, moduleID);
-					m_apPlayerTechSelect[team]->GetListPanel()->ScrollToTop();
+	if (!m_TechAndFlagListFetched) {
+		m_TechAndFlagListFetched = true;
+		// Populate the tech comboboxes with the available tech modules
+		for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
+			m_apPlayerTechSelect[player]->GetListPanel()->AddItem("-Random-", "", nullptr, nullptr, -1);
+			m_apPlayerTechSelect[player]->SetSelectedIndex(0);
+		}
+		for (int moduleID = 0; moduleID < g_PresetMan.GetTotalModuleCount(); ++moduleID) {
+			if (const DataModule* dataModule = g_PresetMan.GetDataModule(moduleID)) {
+				if (dataModule->IsFaction()) {
+					for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
+						m_apPlayerTechSelect[player]->GetListPanel()->AddItem(dataModule->GetFriendlyName(), "", nullptr, nullptr, moduleID);
+					}
 				}
 			}
 		}
-	}
+		// Start scrolled to the top.
+		for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
+			m_apPlayerTechSelect[player]->GetListPanel()->ScrollToTop();
+		}
 
-	std::list<Entity*> flagList;
-	g_PresetMan.GetAllOfGroup(flagList, "Flags", "Icon");
-	for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
-		for (std::list<Entity*>::iterator itr = flagList.begin(); itr != flagList.end(); ++itr) {
-			if (const Icon* pIcon = dynamic_cast<Icon*>(*itr)) {
-				m_apPlayerTeamSelect[player]->AddItem("", "", new AllegroBitmap(pIcon->GetBitmaps32()[0]), pIcon);
+		// Populate team selection flags.
+		std::list<Entity*> flagList;
+		g_PresetMan.GetAllOfGroup(flagList, "Flags", "Icon");
+		for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
+			for (std::list<Entity*>::iterator itr = flagList.begin(); itr != flagList.end(); ++itr) {
+				if (const Icon* pIcon = dynamic_cast<Icon*>(*itr)) {
+					m_apPlayerTeamSelect[player]->AddItem("", "", new AllegroBitmap(pIcon->GetBitmaps32()[0]), pIcon);
+				}
 			}
 		}
 	}
-	if (m_apPlayerTeamSelect[Players::PlayerOne]->GetSelectedIndex() < 0) {
-		m_apPlayerTeamSelect[Players::PlayerOne]->SetSelectedIndex(0);
+	// If a player has no team selected, default to the same team as their player index.
+	for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
+		if (m_apPlayerTeamSelect[player]->GetSelectedIndex() < 0) {
+			m_apPlayerTeamSelect[player]->SetSelectedIndex(player);
+		}
 	}
 
 	m_ScreenChange = true;

Source/Menus/MetagameGUI.h

@@ -772,6 +772,8 @@ namespace RTE {
 		// The scene currently being played, NOT OWNED
 		Scene* m_pPlayingScene;
 
+		bool m_TechAndFlagListFetched; //!< Whether the tech list was fetched and each team's ComboBox was populated with it, even if no valid tech modules were added. The team flags are also populated at the same time.
+
 		// NEW GAME DIALOG
 		// Game size label and slider
 		GUILabel* m_pSizeLabel;

Source/Menus/ScenarioActivityConfigGUI.cpp

@@ -73,18 +73,20 @@ void ScenarioActivityConfigGUI::PopulateTechComboBoxes() {
 	for (int team = Activity::Teams::TeamOne; team < Activity::Teams::MaxTeamCount; ++team) {
 		m_TeamTechComboBoxes[team]->GetListPanel()->AddItem("-All-", "", nullptr, nullptr, -2);
 		m_TeamTechComboBoxes[team]->GetListPanel()->AddItem("-Random-", "", nullptr, nullptr, -1);
+		m_TeamTechComboBoxes[team]->SetSelectedIndex(0);
 	}
 	for (int moduleID = 0; moduleID < g_PresetMan.GetTotalModuleCount(); ++moduleID) {
 		if (const DataModule* dataModule = g_PresetMan.GetDataModule(moduleID)) {
 			if (dataModule->IsFaction()) {
 				for (int team = Activity::Teams::TeamOne; team < Activity::Teams::MaxTeamCount; ++team) {
 					m_TeamTechComboBoxes[team]->GetListPanel()->AddItem(dataModule->GetFriendlyName(), "", nullptr, nullptr, moduleID);
-					m_TeamTechComboBoxes[team]->GetListPanel()->ScrollToTop();
-					m_TeamTechComboBoxes[team]->SetSelectedIndex(0);
 				}
 			}
 		}
 	}
+	for (int team = Activity::Teams::TeamOne; team < Activity::Teams::MaxTeamCount; ++team) {
+		m_TeamTechComboBoxes[team]->GetListPanel()->ScrollToTop();
+	}
 	m_TechListFetched = true;
 }