Merge pull request #42 from cortex-command-community/null-activity

Only perform activity actions when activity is running

Author: Causeless

Source/Managers/MovableMan.cpp

@@ -683,7 +683,10 @@ void MovableMan::AddActor(Actor* actorToAdd) {
 
 void MovableMan::AddItem(HeldDevice* itemToAdd) {
 	if (itemToAdd) {
+		RTEAssert(g_ActivityMan.ActivityRunning(), "No activity running, can't add items!");
+
 		g_ActivityMan.GetActivity()->ForceSetTeamAsActive(itemToAdd->GetTeam());
+
 		itemToAdd->SetAsAddedToMovableMan();
 		itemToAdd->CorrectAttachableAndWoundPositionsAndRotations();
 
@@ -706,7 +709,10 @@ void MovableMan::AddItem(HeldDevice* itemToAdd) {
 
 void MovableMan::AddParticle(MovableObject* particleToAdd) {
 	if (particleToAdd) {
+		RTEAssert(g_ActivityMan.ActivityRunning(), "No activity running, can't add particles!");
+
 		g_ActivityMan.GetActivity()->ForceSetTeamAsActive(particleToAdd->GetTeam());
+
 		particleToAdd->SetAsAddedToMovableMan();
 		if (MOSRotating* particleToAddAsMOSRotating = dynamic_cast<MOSRotating*>(particleToAdd)) {
 			particleToAddAsMOSRotating->CorrectAttachableAndWoundPositionsAndRotations();

Source/System/DataModule.cpp

@@ -133,9 +133,9 @@ int DataModule::ReadModuleProperties(const std::string& moduleName, const Progre
 }
 
 int DataModule::ReadProperty(const std::string_view& propName, Reader& reader) {
-	StartPropertyList(if (!g_PresetMan.GetEntityPreset(reader)) { reader.ReportError("Could not understand Preset type!"); })
+	StartPropertyList(if (!g_PresetMan.GetEntityPreset(reader)) { reader.ReportError("Could not understand Preset type!"); });
 
-	    MatchProperty("ModuleName", { reader >> m_FriendlyName; });
+	MatchProperty("ModuleName", { reader >> m_FriendlyName; });
 	MatchProperty("Author", { reader >> m_Author; });
 	MatchProperty("Description", {
 		std::string descriptionValue = reader.ReadPropValue();