C4FindObject: Replace all object pointers to objects that were remove…

…d in a Sort_Func callback with nullptr to match the previous behavior
legacyclonk · Nov 12, 2023 · d3166f5 · d3166f5
1 parent 356ccdd
commit d3166f5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/C4FindObject.cpp b/src/C4FindObject.cpp
@@ -217,7 +217,11 @@ C4ValueArray *C4FindObject::FindMany(const C4ObjectList &Objs)
 	// Recheck object status (may shrink array again)
 	CheckObjectStatus(result);
 	// Apply sorting
-	if (pSort) pSort->SortObjects(result);
+	if (pSort)
+	{
+		pSort->SortObjects(result);
+		CheckObjectStatusAfterSort(result);
+	}
 	return new C4ValueArray{std::span{result}};
 }
 
@@ -352,7 +356,11 @@ C4ValueArray *C4FindObject::FindMany(const C4ObjectList &Objs, const C4LSectors
 	// Recheck object status (may shrink array again)
 	CheckObjectStatus(result);
 	// Apply sorting
-	if (pSort) pSort->SortObjects(result);
+	if (pSort)
+	{
+		pSort->SortObjects(result);
+		CheckObjectStatusAfterSort(result);
+	}
 	return new C4ValueArray{std::span{result}};
 }
 
@@ -361,6 +369,11 @@ void C4FindObject::CheckObjectStatus(std::vector<C4Object *> &objects)
 	std::erase_if(objects, [](C4Object *const obj) { return !obj->Status; });
 }
 
+void C4FindObject::CheckObjectStatusAfterSort(std::vector<C4Object *> &objects)
+{
+	std::ranges::replace_if(objects, [](C4Object *const obj) { return !obj->Status; }, nullptr);
+}
+
 void C4FindObject::SetSort(C4SortObject *pToSort)
 {
 	delete pSort;

diff --git a/src/C4FindObject.h b/src/C4FindObject.h
@@ -97,6 +97,7 @@ class C4FindObject
 
 private:
 	void CheckObjectStatus(std::vector<C4Object *> &objects);
+	void CheckObjectStatusAfterSort(std::vector<C4Object *> &objects);
 };
 
 // Combinators