Fix everything after a quick look at how to actually use pointers.

Author: Bit-Crust

Source/Entities/AEmitter.cpp

@@ -64,8 +64,8 @@ int AEmitter::Create(const AEmitter& reference) {
 		SetFlash(dynamic_cast<Attachable*>(reference.m_pFlash->Clone()));
 	}
 
-	for (const Emission* emission: reference.m_EmissionList) {
-		m_EmissionList.push_back(dynamic_cast<Emission*>(emission->Clone()));
+	for (Emission* emission: reference.m_EmissionList) {
+		m_EmissionList.push_back(static_cast<Emission*>(emission->Clone()));
 	}
 	if (reference.m_EmissionSound) {
 		m_EmissionSound = dynamic_cast<SoundContainer*>(reference.m_EmissionSound->Clone());
@@ -106,10 +106,10 @@ int AEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 
 	MatchProperty("AddEmission", {
 		Entity* readerEntity = g_PresetMan.ReadReflectedPreset(reader);
-		if (Emission* readerEmission = dynamic_cast<Emission*>(readerEntity)) {
-			m_EmissionList.push_back(readerEmission);
+		if (Emission* readerAttachable = dynamic_cast<Emission*>(readerEntity)) {
+			m_EmissionList.push_back(readerAttachable);
 		} else {
-			reader.ReportError("Tried to AddEmission a non-Emission type!");
+			reader.ReportError("Tried to AddAttachable a non-Attachable type!");
 		}
 	});
 	MatchProperty("EmissionSound", {
@@ -132,7 +132,7 @@ int AEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 		reader >> ppm;
 		// Go through all emissions and set the rate so that it emulates the way it used to work, for mod backwards compatibility.
 		for (Emission* emission: m_EmissionList) {
-			emission->SetRate(ppm / static_cast<float>(m_EmissionList.size()));
+			emission->m_PPM = ppm / static_cast<float>(m_EmissionList.size());
 		}
 	});
 	MatchProperty("NegativeThrottleMultiplier", { reader >> m_NegativeThrottleMultiplier; });
@@ -144,7 +144,7 @@ int AEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 		reader >> burstSize;
 		// Go through all emissions and set the rate so that it emulates the way it used to work, for mod backwards compatibility.
 		for (Emission* emission: m_EmissionList) {
-			emission->SetBurstSize(std::ceil(static_cast<float>(burstSize) / static_cast<float>(m_EmissionList.size())));
+			emission->m_BurstSize = std::ceil(static_cast<float>(burstSize) / static_cast<float>(m_EmissionList.size()));
 		}
 	});
 	MatchProperty("BurstScale", { reader >> m_BurstScale; });
@@ -169,9 +169,9 @@ int AEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 int AEmitter::Save(Writer& writer) const {
 	Attachable::Save(writer);
 
-	for (auto itr = m_EmissionList.begin(); itr != m_EmissionList.end(); ++itr) {
+	for (Emission* emission: m_EmissionList) {
 		writer.NewProperty("AddEmission");
-		writer << *itr;
+		writer << *emission;
 	}
 	writer.NewProperty("EmissionSound");
 	writer << m_EmissionSound;
@@ -236,8 +236,8 @@ void AEmitter::Destroy(bool notInherited) {
 		m_EmissionSound->Stop();
 	}
 
-	for (auto eItr = m_EmissionList.begin(); eItr != m_EmissionList.end(); ++eItr) {
-		delete (*eItr);
+	for (Emission* emission: m_EmissionList) {
+		delete emission;
 	}
 
 	delete m_EmissionSound;
@@ -246,15 +246,17 @@ void AEmitter::Destroy(bool notInherited) {
 
 	//    m_BurstSound.Stop();
 
-	if (!notInherited)
+	if (!notInherited) {
 		Attachable::Destroy();
+	}
 	Clear();
 }
 
 void AEmitter::ResetEmissionTimers() {
 	m_LastEmitTmr.Reset();
-	for (Emission* emission: m_EmissionList)
+	for (Emission* emission: m_EmissionList) {
 		emission->ResetEmissionTimers();
+	}
 }
 
 void AEmitter::EnableEmission(bool enable) {
@@ -275,7 +277,7 @@ float AEmitter::EstimateImpulse(bool burst) {
 		float velMin, velMax, velRange, spread;
 
 		// Go through all emissions and emit them according to their respective rates
-		for (const Emission* emission: m_EmissionList) {
+		for (Emission* emission: m_EmissionList) {
 			// Only check emissions that push the emitter
 			if (emission->PushesEmitter()) {
 				float emissions = (emission->GetRate() / 60.0f) * g_TimerMan.GetDeltaTimeSecs();
@@ -313,15 +315,15 @@ float AEmitter::EstimateImpulse(bool burst) {
 float AEmitter::GetTotalParticlesPerMinute() const {
 	float totalPPM = 0;
 	for (const Emission* emission: m_EmissionList) {
-		totalPPM += emission->GetRate();
+		totalPPM += emission->m_PPM;
 	}
 	return totalPPM;
 }
 
 int AEmitter::GetTotalBurstSize() const {
 	int totalBurstSize = 0;
 	for (const Emission* emission: m_EmissionList) {
-		totalBurstSize += emission->GetBurstSize();
+		totalBurstSize += emission->m_BurstSize;
 	}
 	return totalBurstSize;
 }
@@ -435,16 +437,16 @@ void AEmitter::Update() {
 					SPE = 60.0 / currentPPM;
 
 					// Add the last elapsed time to the accumulator
-					emission->SetAccumulator(emission->GetAccumulator() + m_LastEmitTmr.GetElapsedSimTimeS());
+					emission->m_Accumulator += m_LastEmitTmr.GetElapsedSimTimeS();
 
 					// Now figure how many full emissions can fit in the current accumulator
-					emissionCount = std::floor(emission->GetAccumulator() / SPE);
+					emissionCount = std::floor(emission->m_Accumulator / SPE);
 					// Deduct the about to be emitted emissions from the accumulator
-					emission->SetAccumulator(emission->GetAccumulator() - emissionCount * SPE);
+					emission->m_Accumulator -= emissionCount * SPE;
 
-					RTEAssert(emission->GetAccumulator() >= 0, "Emission accumulator negative!");
+					RTEAssert(emission->m_Accumulator >= 0, "Emission accumulator negative!");
 				} else {
-					emission->SetAccumulator(0);
+					emission->m_Accumulator = 0;
 				}
 				float scale = 1.0F;
 				// Add extra emissions if bursting.
@@ -459,8 +461,8 @@ void AEmitter::Update() {
 				}
 				pParticle = 0;
 				emitVel.Reset();
-				Vector rotationalVel = (((RotateOffset(emission->GetOffset()) + (m_Pos - pRootParent->GetPos())) * pRootParent->GetAngularVel()).GetPerpendicular() / c_PPM) * emission->InheritsVelocity();
 				parentVel = pRootParent->GetVel() * emission->InheritsVelocity();
+				Vector rotationalVel = (((RotateOffset(emission->GetOffset()) + (m_Pos - pRootParent->GetPos())) * pRootParent->GetAngularVel()).GetPerpendicular() / c_PPM) * emission->InheritsVelocity();
 
 				for (int i = 0; i < emissionCount; ++i) {
 					velMin = emission->GetMinVelocity() * scale;
@@ -500,7 +502,7 @@ void AEmitter::Update() {
 					// Add to accumulative recoil impulse generated, F = m * a
 					// If enabled, that is
 					if (emission->PushesEmitter() && (GetParent() || GetMass() > 0)) {
-						pushImpulses += -emitVel * pParticle->GetMass();
+						pushImpulses -= emitVel * pParticle->GetMass();
 					}
 
 					// Set the emitted particle to not hit this emitter's parent, if applicable

Source/Entities/AEmitter.h

@@ -77,10 +77,6 @@ namespace RTE {
 		/// @return The combined burst size of all Emissions in this AEmitter.
 		int GetTotalBurstSize() const;
 
-		/// Gets the list of Emissions of this AEmitter.
-		/// @return The list of Emissions of this AEmitter.
-		const std::vector<Emission*>& GetEmissionList() const { return m_EmissionList; }
-
 		/// Gets the scale factor that will be applied to the regular spread and
 		/// emission velocity to get the burst particle parameters.
 		/// @return The scale factor.
@@ -370,8 +366,8 @@ namespace RTE {
 		// Member variables
 		static Entity::ClassInfo m_sClass;
 
-		// The list of pointers to MO emission objects
-		std::vector<Emission*> m_EmissionList;
+		// The list of MO instances that get emitted
+		std::list<Emission*> m_EmissionList;
 		// Sounds
 		SoundContainer* m_EmissionSound;
 		SoundContainer* m_BurstSound;

Source/Entities/Emission.h

@@ -146,14 +146,6 @@ namespace RTE {
 		/// @param newParticleCount The new number of particles emitted per emission.
 		void SetParticleCount(int newParticleCount) { m_ParticleCount = newParticleCount; }
 
-		/// Returns the current time accumulation of this emitter.
-		/// @return the current time accumulation of this emitter.
-		double GetAccumulator() const { return m_Accumulator; }
-
-		/// Changes time accumulation of this emitter.
-		/// @param increment The time to be added to the accumulation.
-		void SetAccumulator(double increment) { m_Accumulator += increment; }
-
 		/// Protected member variable and method declarations
 	protected:
 		// Member variables

Source/Entities/MOSRotating.h

@@ -163,7 +163,7 @@ namespace RTE {
 
 		/// Returns whether this MOSprite is currently under the effects of
 		/// recoil.
-		bool IsRecoiled() const { return m_Recoiled; }
+		bool IsRecoiled() { return m_Recoiled; }
 
 		/// Sets whether or not this MOSRotating should check for deep penetrations
 		/// the terrain or not.

Source/Entities/PEmitter.cpp

@@ -58,8 +58,8 @@ int PEmitter::Create() {
 int PEmitter::Create(const PEmitter& reference) {
 	MOSParticle::Create(reference);
 
-	for (const Emission* emission: reference.m_EmissionList) {
-		m_EmissionList.push_back(dynamic_cast<Emission*>(emission->Clone()));
+	for (Emission* emission: reference.m_EmissionList) {
+		m_EmissionList.push_back(static_cast<Emission*>(emission->Clone()));
 	}
 	m_EmissionSound = reference.m_EmissionSound;
 	m_BurstSound = reference.m_BurstSound;
@@ -91,12 +91,12 @@ int PEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 
 	MatchProperty("AddEmission", {
 		Entity* readerEntity = g_PresetMan.ReadReflectedPreset(reader);
-		if (Emission* readerEmission = dynamic_cast<Emission*>(readerEntity)) {
-			m_EmissionList.push_back(readerEmission);
+		if (Emission* readerAttachable = dynamic_cast<Emission*>(readerEntity)) {
+			m_EmissionList.push_back(readerAttachable);
 		} else {
-			reader.ReportError("Tried to AddEmission a non-Emission type!");
+			reader.ReportError("Tried to AddAttachable a non-Attachable type!");
 		}
-	 });
+	});
 	MatchProperty("EmissionSound", { reader >> m_EmissionSound; });
 	MatchProperty("BurstSound", { reader >> m_BurstSound; });
 	MatchProperty("EndSound", { reader >> m_EndSound; });
@@ -139,9 +139,9 @@ int PEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 int PEmitter::Save(Writer& writer) const {
 	MOSParticle::Save(writer);
 
-	for (auto itr = m_EmissionList.begin(); itr != m_EmissionList.end(); ++itr) {
+	for (Emission* emission: m_EmissionList) {
 		writer.NewProperty("AddEmission");
-		writer << *itr;
+		writer << *emission;
 	}
 	writer.NewProperty("EmissionSound");
 	writer << m_EmissionSound;
@@ -191,10 +191,11 @@ int PEmitter::Save(Writer& writer) const {
 
 void PEmitter::Destroy(bool notInherited) {
 	// Stop playback of sounds gracefully
-	if (m_EmissionSound.IsBeingPlayed())
+	if (m_EmissionSound.IsBeingPlayed()) {
 		m_EndSound.Play(m_Pos);
-	else
+	} else {
 		m_EndSound.Stop();
+	}
 
 	for (Emission* emission: m_EmissionList) {
 		delete emission;

Source/Entities/PEmitter.h

@@ -280,7 +280,7 @@ namespace RTE {
 		static Entity::ClassInfo m_sClass;
 
 		// The list of MO instances that get emitted
-		std::vector<Emission*> m_EmissionList;
+		std::list<Emission*> m_EmissionList;
 		// Sounds
 		SoundContainer m_EmissionSound;
 		SoundContainer m_BurstSound;