Corrected odd Emission getting for AEmitter and PEmitter.

cortex-command-community · Nov 20, 2024 · d839f65 · d839f65
1 parent 4d0789d
commit d839f65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/Source/Entities/AEmitter.cpp b/Source/Entities/AEmitter.cpp
@@ -105,12 +105,9 @@ int AEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 	StartPropertyList(return Attachable::ReadProperty(propName, reader));
 
 	MatchProperty("AddEmission", {
-		Entity* readerEntity = g_PresetMan.ReadReflectedPreset(reader);
-		if (Emission* readerAttachable = dynamic_cast<Emission*>(readerEntity)) {
-			m_EmissionList.push_back(readerAttachable);
-		} else {
-			reader.ReportError("Tried to AddAttachable a non-Attachable type!");
-		}
+		Emission* emission = new Emission();
+		reader >> *emission;
+		m_EmissionList.push_back(emission);
 	});
 	MatchProperty("EmissionSound", {
 		m_EmissionSound = new SoundContainer;

diff --git a/Source/Entities/PEmitter.cpp b/Source/Entities/PEmitter.cpp
@@ -90,12 +90,9 @@ int PEmitter::ReadProperty(const std::string_view& propName, Reader& reader) {
 	StartPropertyList(return MOSParticle::ReadProperty(propName, reader));
 
 	MatchProperty("AddEmission", {
-		Entity* readerEntity = g_PresetMan.ReadReflectedPreset(reader);
-		if (Emission* readerAttachable = dynamic_cast<Emission*>(readerEntity)) {
-			m_EmissionList.push_back(readerAttachable);
-		} else {
-			reader.ReportError("Tried to AddAttachable a non-Attachable type!");
-		}
+		Emission* emission = new Emission();
+		reader >> *emission;
+		m_EmissionList.push_back(emission);
 	});
 	MatchProperty("EmissionSound", { reader >> m_EmissionSound; });
 	MatchProperty("BurstSound", { reader >> m_BurstSound; });