Make all entity bindings returning iterators have affect outside of lua by changing referenced std iterators to work over pointers instead of raw values, meaning the value copies passed to lua are value copies of pointers, not raw values.

Author: Bit-Crust

Source/Activities/AreaEditor.cpp

@@ -294,12 +294,12 @@ void AreaEditor::Update() {
 						m_pEditorGUI->SetEditorGUIMode(AreaEditorGUI::PREADDMOVEBOX);
 					} else {
 						// Make and name new Area
-						Scene::Area newArea(m_pNewAreaName->GetText());
+						Scene::Area* newArea = new Scene::Area(m_pNewAreaName->GetText());
 						pCurrentScene->m_AreaList.push_back(newArea);
 						// Set the new area as the active one in the GUI, note we're getting the correct one from the scene, it's a copy of the one passed in
-						m_pEditorGUI->SetCurrentArea(pCurrentScene->GetArea(newArea.GetName()));
+						m_pEditorGUI->SetCurrentArea(pCurrentScene->GetArea(newArea->GetName()));
 						// Update teh picker list of the GUI so we can mousewheel between all the Areas, incl the new one
-						m_pEditorGUI->UpdatePickerList(newArea.GetName());
+						m_pEditorGUI->UpdatePickerList(newArea->GetName());
 					}
 
 					// Change mode to start editing the new/newly selected Area

Source/Activities/GibEditor.cpp

@@ -400,14 +400,14 @@ void GibEditor::Update() {
 					m_pEditedObject->Update();
 
 					// Make proxy copies of the loaded objects' gib reference instances and place them in the list to be edited
-					std::list<Gib>* pLoadedGibList = m_pEditedObject->GetGibList();
+					std::list<Gib*>* pLoadedGibList = m_pEditedObject->GetGibList();
 					std::list<MovableObject*>* pEditedGibList = m_pEditorGUI->GetPlacedGibs();
 					MovableObject* pGibCopy = 0;
 
 					for (auto gItr = pLoadedGibList->begin(); gItr != pLoadedGibList->end(); ++gItr) {
-						pGibCopy = dynamic_cast<MovableObject*>((*gItr).GetParticlePreset()->Clone());
+						pGibCopy = dynamic_cast<MovableObject*>((*gItr)->GetParticlePreset()->Clone());
 						if (pGibCopy) {
-							pGibCopy->SetPos(m_pEditedObject->GetPos() + (*gItr).GetOffset());
+							pGibCopy->SetPos(m_pEditedObject->GetPos() + (*gItr)->GetOffset());
 							pEditedGibList->push_back(pGibCopy);
 						}
 						pGibCopy = 0;
@@ -599,8 +599,8 @@ bool GibEditor::SaveObject(const std::string& saveAsName, bool forceOverwrite) {
 				}
 				objectWriter.NewProperty(addObjectType);
 				m_pEditedObject->Entity::Save(objectWriter);
-				for (const Gib& gib: *m_pEditedObject->GetGibList()) {
-					objectWriter.NewPropertyWithValue("AddGib", gib);
+				for (const Gib* gib: *m_pEditedObject->GetGibList()) {
+					objectWriter.NewPropertyWithValue("AddGib", *gib);
 				}
 				objectWriter.ObjectEnd();
 				objectWriter.EndWrite();
@@ -626,18 +626,18 @@ void GibEditor::StuffEditedGibs(MOSRotating* pEditedObject) {
 		return;
 
 	// Replace the gibs of the object with the proxies that have been edited in the gui
-	std::list<Gib>* pObjectGibList = pEditedObject->GetGibList();
+	std::list<Gib*>* pObjectGibList = pEditedObject->GetGibList();
 	pObjectGibList->clear();
 
 	// Take each proxy object and stuff it into a Gib instance which then gets stuffed into the object to be saved
 	std::list<MovableObject*>* pProxyGibList = m_pEditorGUI->GetPlacedGibs();
 	for (std::list<MovableObject*>::iterator gItr = pProxyGibList->begin(); gItr != pProxyGibList->end(); ++gItr) {
-		Gib newGib;
+		Gib* newGib;
 		// Only set the refernce instance directly from the isntanceman. OWNERSHIP IS NOT TRANSFERRED!
-		newGib.m_GibParticle = dynamic_cast<const MovableObject*>(g_PresetMan.GetEntityPreset((*gItr)->GetClassName(), (*gItr)->GetPresetName(), m_ModuleSpaceID));
-		if (newGib.m_GibParticle) {
-			newGib.m_Count = 1;
-			newGib.m_Offset = (*gItr)->GetPos() - pEditedObject->GetPos();
+		newGib->m_GibParticle = dynamic_cast<const MovableObject*>(g_PresetMan.GetEntityPreset((*gItr)->GetClassName(), (*gItr)->GetPresetName(), m_ModuleSpaceID));
+		if (newGib->m_GibParticle) {
+			newGib->m_Count = 1;
+			newGib->m_Offset = (*gItr)->GetPos() - pEditedObject->GetPos();
 			// TODO: do proper velocity calculations here!
 			// ... actually leave these as 0 and let them be calculated in GibThis
 			//            newGib.m_MinVelocity = (100.0f + 50.0f * NormalRand()) / (*gItr)->GetMass();

Source/Entities/MOSRotating.cpp

@@ -228,8 +228,8 @@ int MOSRotating::Create(const MOSRotating& reference) {
 	}
 	m_ReferenceHardcodedAttachableUniqueIDs.clear();
 
-	for (const Gib& gib: reference.m_Gibs) {
-		m_Gibs.push_back(gib);
+	for (const Gib* gib: reference.m_Gibs) {
+		m_Gibs.push_back(new Gib(*gib));
 	}
 
 	m_GibImpulseLimit = reference.m_GibImpulseLimit;
@@ -302,8 +302,8 @@ int MOSRotating::ReadProperty(const std::string_view& propName, Reader& reader)
 	});
 	MatchProperty("AddGib",
 	              {
-		              Gib gib;
-		              reader >> gib;
+		              Gib* gib = new Gib();
+		              reader >> *gib;
 		              m_Gibs.push_back(gib);
 	              });
 	MatchProperty("GibImpulseLimit", { reader >> m_GibImpulseLimit; });
@@ -356,7 +356,7 @@ int MOSRotating::Save(Writer& writer) const {
 	*/
 	for (auto gItr = m_Gibs.begin(); gItr != m_Gibs.end(); ++gItr) {
 		writer.NewProperty("AddGib");
-		writer << (*gItr);
+		writer << (**gItr);
 	}
 	/*
 	    writer.NewProperty("GibImpulseLimit");
@@ -555,6 +555,10 @@ void MOSRotating::Destroy(bool notInherited) {
 		delete (*itr);
 	}
 
+	for (auto gib = m_Gibs.begin(); gib != m_Gibs.end(); ++gib) {
+		delete (*gib);
+	}
+
 	for (auto aItr = m_Attachables.begin(); aItr != m_Attachables.end(); ++aItr) {
 		if (m_HardcodedAttachableUniqueIDsAndRemovers.find((*aItr)->GetUniqueID()) == m_HardcodedAttachableUniqueIDsAndRemovers.end()) {
 			delete (*aItr);
@@ -895,17 +899,17 @@ void MOSRotating::CreateGibsWhenGibbing(const Vector& impactImpulse, MovableObje
 		g_CameraMan.AddScreenShake(m_GibScreenShakeAmount, m_Pos);
 	}
 
-	for (const Gib& gibSettingsObject: m_Gibs) {
-		if (gibSettingsObject.GetCount() == 0) {
+	for (const Gib* gibSettingsObject: m_Gibs) {
+		if (gibSettingsObject->GetCount() == 0) {
 			continue;
 		}
-		MovableObject* gibParticleClone = dynamic_cast<MovableObject*>(gibSettingsObject.GetParticlePreset()->Clone());
+		MovableObject* gibParticleClone = dynamic_cast<MovableObject*>(gibSettingsObject->GetParticlePreset()->Clone());
 
-		int count = gibSettingsObject.GetCount();
-		float lifeVariation = gibSettingsObject.GetLifeVariation();
-		float spread = gibSettingsObject.GetSpread();
-		float minVelocity = gibSettingsObject.GetMinVelocity();
-		float maxVelocity = gibSettingsObject.GetMaxVelocity();
+		int count = gibSettingsObject->GetCount();
+		float lifeVariation = gibSettingsObject->GetLifeVariation();
+		float spread = gibSettingsObject->GetSpread();
+		float minVelocity = gibSettingsObject->GetMinVelocity();
+		float maxVelocity = gibSettingsObject->GetMaxVelocity();
 
 		float mass = (gibParticleClone->GetMass() != 0 ? gibParticleClone->GetMass() : 0.0001F);
 		int lifetime = gibParticleClone->GetLifetime();
@@ -923,18 +927,18 @@ void MOSRotating::CreateGibsWhenGibbing(const Vector& impactImpulse, MovableObje
 		}
 
 		float velocityRange = maxVelocity - minVelocity;
-		Vector rotatedGibOffset = RotateOffset(gibSettingsObject.GetOffset());
+		Vector rotatedGibOffset = RotateOffset(gibSettingsObject->GetOffset());
 
 		// The "Spiral" spread mode uses the fermat spiral as means to determine the velocity of the gib particles, resulting in a evenly spaced out circle (or ring) of particles.
-		if (gibSettingsObject.GetSpreadMode() == Gib::SpreadMode::SpreadSpiral) {
+		if (gibSettingsObject->GetSpreadMode() == Gib::SpreadMode::SpreadSpiral) {
 			float maxRadius = std::sqrt(static_cast<float>(count));
 			float scale = velocityRange / maxRadius;
 			float randAngle = c_PI * RandomNormalNum();
 			float goldenAngle = 2.39996F;
 
 			for (int i = 0; i < count; i++) {
 				if (i > 0) {
-					gibParticleClone = dynamic_cast<MovableObject*>(gibSettingsObject.GetParticlePreset()->Clone());
+					gibParticleClone = dynamic_cast<MovableObject*>(gibSettingsObject->GetParticlePreset()->Clone());
 				}
 
 				float radius = std::sqrt(static_cast<float>(count - i));
@@ -944,20 +948,20 @@ void MOSRotating::CreateGibsWhenGibbing(const Vector& impactImpulse, MovableObje
 				gibVelocity.RadRotate(randAngle + RandomNum(0.0F, spread) + static_cast<float>(i) * goldenAngle);
 
 				Vector offsetFromRootParent = m_Pos - GetRootParent()->GetPos() + rotatedGibOffset;
-				Vector rotationalVelocity = (offsetFromRootParent.GetPerpendicular() * GetRootParent()->GetAngularVel() * gibSettingsObject.InheritsVelocity()) / c_PPM;
+				Vector rotationalVelocity = (offsetFromRootParent.GetPerpendicular() * GetRootParent()->GetAngularVel() * gibSettingsObject->InheritsVelocity()) / c_PPM;
 				gibVelocity += rotationalVelocity;
-				gibParticleClone->SetAngularVel(gibParticleClone->GetAngularVel() + GetRootParent()->GetAngularVel() * gibSettingsObject.InheritsAngularVelocity());
+				gibParticleClone->SetAngularVel(gibParticleClone->GetAngularVel() + GetRootParent()->GetAngularVel() * gibSettingsObject->InheritsAngularVelocity());
 
 				if (lifetime != 0) {
 					gibParticleClone->SetLifetime(std::max(static_cast<int>(static_cast<float>(lifetime) * (1.0F - lifeVariation * ((radius / maxRadius) * 0.75F + RandomNormalNum() * 0.25F))), 1));
 				}
 				gibParticleClone->SetRotAngle(gibVelocity.GetAbsRadAngle() + (m_HFlipped ? c_PI : 0));
 				gibParticleClone->SetAngularVel((gibParticleClone->GetAngularVel() * 0.35F) + (gibParticleClone->GetAngularVel() * 0.65F / mass) * RandomNum());
-				gibParticleClone->SetVel(gibVelocity + ((m_PrevVel + m_Vel) / 2) * gibSettingsObject.InheritsVelocity());
+				gibParticleClone->SetVel(gibVelocity + ((m_PrevVel + m_Vel) / 2) * gibSettingsObject->InheritsVelocity());
 				if (movableObjectToIgnore) {
 					gibParticleClone->SetWhichMOToNotHit(movableObjectToIgnore);
 				}
-				if (gibSettingsObject.IgnoresTeamHits()) {
+				if (gibSettingsObject->IgnoresTeamHits()) {
 					gibParticleClone->SetTeam(m_Team);
 					gibParticleClone->SetIgnoresTeamHits(true);
 				}
@@ -967,7 +971,7 @@ void MOSRotating::CreateGibsWhenGibbing(const Vector& impactImpulse, MovableObje
 		} else {
 			for (int i = 0; i < count; i++) {
 				if (i > 0) {
-					gibParticleClone = dynamic_cast<MovableObject*>(gibSettingsObject.GetParticlePreset()->Clone());
+					gibParticleClone = dynamic_cast<MovableObject*>(gibSettingsObject->GetParticlePreset()->Clone());
 				}
 
 				if (gibParticleClone->GetLifetime() != 0) {
@@ -991,31 +995,31 @@ void MOSRotating::CreateGibsWhenGibbing(const Vector& impactImpulse, MovableObje
 				// TODO: Figure out how much the magnitude of an offset should affect spread
 				float gibSpread = (rotatedGibOffset.IsZero() && spread == 0.1F) ? c_PI : spread;
 				// Determine the primary direction of the gib particles.
-				if (gibSettingsObject.InheritsVelocity() > 0 && !impactImpulse.IsZero()) {
+				if (gibSettingsObject->InheritsVelocity() > 0 && !impactImpulse.IsZero()) {
 					gibVelocity.RadRotate(impactImpulse.GetAbsRadAngle());
 				} else if (!rotatedGibOffset.IsZero()) {
 					gibVelocity.RadRotate(rotatedGibOffset.GetAbsRadAngle());
 				} else {
 					gibVelocity.RadRotate(m_Rotation.GetRadAngle() + (m_HFlipped ? c_PI : 0));
 				}
 				// The "Even" spread will spread all gib particles evenly in an arc, while maintaining a randomized velocity magnitude.
-				if (gibSettingsObject.GetSpreadMode() == Gib::SpreadMode::SpreadEven) {
+				if (gibSettingsObject->GetSpreadMode() == Gib::SpreadMode::SpreadEven) {
 					gibVelocity.RadRotate(gibSpread - (gibSpread * 2.0F * static_cast<float>(i) / static_cast<float>(count)));
 				} else {
 					gibVelocity.RadRotate(gibSpread * RandomNormalNum());
 				}
 
 				Vector offsetFromRootParent = m_Pos - GetRootParent()->GetPos() + rotatedGibOffset;
-				Vector rotationalVelocity = (offsetFromRootParent.GetPerpendicular() * GetRootParent()->GetAngularVel() * gibSettingsObject.InheritsVelocity()) / c_PPM;
+				Vector rotationalVelocity = (offsetFromRootParent.GetPerpendicular() * GetRootParent()->GetAngularVel() * gibSettingsObject->InheritsVelocity()) / c_PPM;
 				gibVelocity += rotationalVelocity;
-				gibParticleClone->SetAngularVel(gibParticleClone->GetAngularVel() + GetRootParent()->GetAngularVel() * gibSettingsObject.InheritsAngularVelocity());
+				gibParticleClone->SetAngularVel(gibParticleClone->GetAngularVel() + GetRootParent()->GetAngularVel() * gibSettingsObject->InheritsAngularVelocity());
 
-				gibParticleClone->SetVel(gibVelocity + ((m_PrevVel + m_Vel) / 2) * gibSettingsObject.InheritsVelocity());
+				gibParticleClone->SetVel(gibVelocity + ((m_PrevVel + m_Vel) / 2) * gibSettingsObject->InheritsVelocity());
 
 				if (movableObjectToIgnore) {
 					gibParticleClone->SetWhichMOToNotHit(movableObjectToIgnore);
 				}
-				if (gibSettingsObject.IgnoresTeamHits()) {
+				if (gibSettingsObject->IgnoresTeamHits()) {
 					gibParticleClone->SetTeam(m_Team);
 					gibParticleClone->SetIgnoresTeamHits(true);
 				}

Source/Entities/MOSRotating.h

@@ -146,7 +146,7 @@ namespace RTE {
 
 		/// Gets direct access to the list of object this is to generate upon gibbing.
 		/// @return A pointer to the list of gibs. Ownership is NOT transferred!
-		std::list<Gib>* GetGibList() { return &m_Gibs; }
+		std::list<Gib*>* GetGibList() { return &m_Gibs; }
 
 		/// Adds graphical recoil offset to this MOSprite according to its angle.
 		void AddRecoil();
@@ -551,7 +551,7 @@ namespace RTE {
 		float m_FarthestAttachableDistanceAndRadius; //!< The distance + radius of the radius affecting Attachable.
 		float m_AttachableAndWoundMass; //!< The mass of all Attachables and wounds on this MOSRotating. Used in combination with its actual mass and any other affecting factors to get its total mass.
 		// The list of Gib:s this will create when gibbed
-		std::list<Gib> m_Gibs;
+		std::list<Gib*> m_Gibs;
 		// The amount of impulse force required to gib this, in kg * (m/s). 0 means no limit
 		float m_GibImpulseLimit;
 		int m_GibWoundLimit; //!< The number of wounds that will gib this MOSRotating. 0 means that it can't be gibbed via wounds.

Source/Entities/Scene.cpp

@@ -431,8 +431,8 @@ int Scene::Create(const Scene& reference) {
 	}
 
 	// Copy areas
-	for (std::list<Area>::const_iterator aItr = reference.m_AreaList.begin(); aItr != reference.m_AreaList.end(); ++aItr)
-		m_AreaList.push_back(*aItr);
+	for (Area* area: reference.m_AreaList)
+		m_AreaList.push_back(new Area(*area));
 
 	m_GlobalAcc = reference.m_GlobalAcc;
 
@@ -1156,11 +1156,11 @@ int Scene::Save(Writer& writer) const {
 		writer.NewProperty("ScanScheduledTeam4");
 		writer << m_ScanScheduled[Activity::TeamFour];
 	}
-	for (std::list<Area>::const_iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
+	for (Area* area: m_AreaList) {
 		// Only write the area if it has any boxes/area at all
-		if (doFullGameSave || !(*aItr).HasNoArea()) {
+		if (doFullGameSave || !(*area).HasNoArea()) {
 			writer.NewProperty("AddArea");
-			writer << *aItr;
+			writer << *area;
 		}
 	}
 	writer.NewProperty("GlobalAcceleration");
@@ -1443,6 +1443,9 @@ void Scene::Destroy(bool notInherited) {
 		*slItr = 0;
 	}
 
+	for (Area* area: m_AreaList)
+		delete area;
+
 	delete m_apUnseenLayer[Activity::TeamOne];
 	delete m_apUnseenLayer[Activity::TeamTwo];
 	delete m_apUnseenLayer[Activity::TeamThree];
@@ -1840,33 +1843,33 @@ int Scene::GetResidentBrainCount() const {
 }
 
 bool Scene::SetArea(Area& newArea) {
-	for (std::list<Area>::iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
+	for (Area* area: m_AreaList) {
 		// Try to find an existing area of the same name
-		if ((*aItr).GetName() == newArea.GetName()) {
+		if (area->GetName() == newArea.GetName()) {
 			// Deep copy into the existing area
-			(*aItr).Reset();
-			(*aItr).Create(newArea);
+			area->Reset();
+			area->Create(newArea);
 			return true;
 		}
 	}
 	// Couldn't find one, so just add the new Area
-	m_AreaList.push_back(newArea);
+	m_AreaList.push_back(new Area(newArea));
 
 	return false;
 }
 
 bool Scene::HasArea(std::string areaName) {
-	for (std::list<Area>::iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
-		if ((*aItr).GetName() == areaName)
+	for (Area* area: m_AreaList) {
+		if (area->GetName() == areaName)
 			return true;
 	}
 	return false;
 }
 
 Scene::Area* Scene::GetArea(const std::string_view& areaName, bool required) {
-	for (Scene::Area& area: m_AreaList) {
-		if (area.GetName() == areaName) {
-			return &area;
+	for (Scene::Area*& area: m_AreaList) {
+		if (area->GetName() == areaName) {
+			return area;
 		}
 	}
 
@@ -1878,8 +1881,8 @@ Scene::Area* Scene::GetArea(const std::string_view& areaName, bool required) {
 }
 
 bool Scene::RemoveArea(std::string areaName) {
-	for (std::list<Area>::iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
-		if ((*aItr).GetName() == areaName) {
+	for (std::list<Area*>::iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
+		if ((*aItr)->GetName() == areaName) {
 			m_AreaList.erase(aItr);
 			return true;
 		}
@@ -1891,8 +1894,8 @@ bool Scene::WithinArea(std::string areaName, const Vector& point) const {
 	if (areaName.empty())
 		return false;
 
-	for (std::list<Area>::const_iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
-		if ((*aItr).GetName() == areaName && (*aItr).IsInside(point))
+	for (std::list<Area*>::const_iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
+		if ((*aItr)->GetName() == areaName && (*aItr)->IsInside(point))
 			return true;
 	}
 

Source/Entities/Scene.h

@@ -345,7 +345,7 @@ namespace RTE {
 
 		/// Adds area to the list if this scene's areas.
 		/// @param m_AreaList.push_back(newArea Area to add.
-		void AddArea(Scene::Area& newArea) { m_AreaList.push_back(newArea); }
+		void AddArea(Scene::Area& newArea) { m_AreaList.push_back(new Scene::Area(newArea)); }
 
 		/// Creates a new SceneLayer for a specific team and fills it with black
 		/// pixels that end up being a specific size on the screen.
@@ -767,7 +767,7 @@ namespace RTE {
 		bool m_ScanScheduled[Activity::MaxTeamCount];
 
 		// List of all the specified Area's of the scene
-		std::list<Area> m_AreaList;
+		std::list<Area*> m_AreaList;
 
 		// List of navigatable areas in the scene. If this list is empty, the entire scene is assumed to be navigatable
 		std::vector<std::string> m_NavigatableAreas;