Only copy if we're actually adding the pie slice - avoids expensive memory allocations

Author: Causeless

Activities/GAScripted.cpp

@@ -559,12 +559,12 @@ void GAScripted::AddPieSlicesToActiveActorPieMenus() {
 			PieMenu *controlledActorPieMenu = m_ControlledActor[player]->GetPieMenu();
 			if (controlledActorPieMenu && m_ControlledActor[player]->GetController()->IsState(PIE_MENU_ACTIVE) && controlledActorPieMenu->IsEnabling()) {
 				for (const std::unique_ptr<PieSlice> &pieSlice : m_PieSlicesToAdd) {
-					controlledActorPieMenu->AddPieSliceIfPresetNameIsUnique(dynamic_cast<PieSlice *>(pieSlice->Clone()), this, true);
+					controlledActorPieMenu->AddPieSliceIfPresetNameIsUnique(pieSlice.get(), this, true);
 				}
 				for (const GlobalScript *globalScript : m_GlobalScriptsList) {
 					if (globalScript->IsActive()) {
 						for (const std::unique_ptr<PieSlice> &pieSlice : globalScript->GetPieSlicesToAdd()) {
-							controlledActorPieMenu->AddPieSliceIfPresetNameIsUnique(dynamic_cast<PieSlice *>(pieSlice->Clone()), globalScript, true);
+							controlledActorPieMenu->AddPieSliceIfPresetNameIsUnique(pieSlice.get(), globalScript, true);
 						}
 					}
 				}

Entities/PieMenu.cpp

@@ -378,7 +378,7 @@ namespace RTE {
 		const std::string &pieSlicePresetName = pieSliceToAdd->GetPresetName();
 
 		if (pieSlicePresetName == "None") {
-			return AddPieSlice(pieSliceToAdd, pieSliceOriginalSource, allowQuadrantOverflow);
+			return AddPieSlice(dynamic_cast<PieSlice*>(pieSliceToAdd->Clone()), pieSliceOriginalSource, allowQuadrantOverflow);
 		}
 
 		bool pieSliceAlreadyExists = onlyCheckPieSlicesWithSameOriginalSource ? false : GetFirstPieSliceByPresetName(pieSlicePresetName) != nullptr;
@@ -392,11 +392,10 @@ namespace RTE {
 		}
 
 		if (pieSliceAlreadyExists) {
-			delete pieSliceToAdd;
 			return false;
 		}
 
-		return AddPieSlice(pieSliceToAdd, pieSliceOriginalSource, allowQuadrantOverflow);
+		return AddPieSlice(dynamic_cast<PieSlice*>(pieSliceToAdd->Clone()), pieSliceOriginalSource, allowQuadrantOverflow);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Lua/LuaBindingsEntities.cpp

@@ -1210,9 +1210,9 @@ namespace RTE {
 		.def("GetFirstPieSliceByType", &PieMenu::GetFirstPieSliceByType)
 		.def("AddPieSlice", &PieMenu::AddPieSlice, luabind::adopt(_2))
 		.def("AddPieSlice", &LuaAdaptersPieMenu::AddPieSlice, luabind::adopt(_2))
-		.def("AddPieSliceIfPresetNameIsUnique", &PieMenu::AddPieSliceIfPresetNameIsUnique, luabind::adopt(_2))
-		.def("AddPieSliceIfPresetNameIsUnique", &LuaAdaptersPieMenu::AddPieSliceIfPresetNameIsUnique1, luabind::adopt(_2))
-		.def("AddPieSliceIfPresetNameIsUnique", &LuaAdaptersPieMenu::AddPieSliceIfPresetNameIsUnique2, luabind::adopt(_2))
+		.def("AddPieSliceIfPresetNameIsUnique", &PieMenu::AddPieSliceIfPresetNameIsUnique)
+		.def("AddPieSliceIfPresetNameIsUnique", &LuaAdaptersPieMenu::AddPieSliceIfPresetNameIsUnique1)
+		.def("AddPieSliceIfPresetNameIsUnique", &LuaAdaptersPieMenu::AddPieSliceIfPresetNameIsUnique2)
 		.def("RemovePieSlice", &PieMenu::RemovePieSlice, luabind::adopt(luabind::return_value))
 		.def("RemovePieSlicesByPresetName", &PieMenu::RemovePieSlicesByPresetName)
 		.def("RemovePieSlicesByType", &PieMenu::RemovePieSlicesByType)