Ticket #3717: fastSpatial.patch

source/simulation2/components/CCmpRangeManager.cpp

@@ -1087 +1087 @@
 
                 r.push_back(it->first);
             }
+            std::sort(r.begin(), r.end());
         }
         // check a regular range (i.e. not the entire world, and not parabolic)
         else
@@ -1117 +1118 @@
 
                 r.push_back(it->first);
             }
+            std::sort(r.begin(), r.end());
         }
     }
 

source/simulation2/helpers/Spatial.h

@@ -514 +514 @@
     }
 
     /**
-     * Returns a sorted list of items that are either in the square or close to it.
-     * It's the responsibility of the querier to do proper distance checking.
+     * Returns a (non sorted) list of items that are either in the square or close to it.
+     * It's the responsibility of the querier to do proper distance checking and entity sorting.
      */
     void GetInRange(std::vector<entity_id_t>& out, CFixedVector2D posMin, CFixedVector2D posMax)
     {
@@ -545 +545 @@
                     out.insert(out.end(), subdivision.begin(), subdivision.end());
             }
         }
-
-        std::sort(out.begin(), out.end());
     }
 
     /**
-     * Returns a sorted list of items that are either in the circle or close to it.
-     * It's the responsibility of the querier to do proper distance checking.
+     * Returns a (non sorted) list of items that are either in the circle or close to it.
+     * It's the responsibility of the querier to do proper distance checking and entity sorting.
      */
     void GetNear(std::vector<entity_id_t>& out, CFixedVector2D pos, entity_pos_t range)
     {