refactor(radar): Simplify function Radar::deleteListResources (#1893)

Author: xezon

Core/GameEngine/Include/Common/Radar.h

@@ -239,6 +239,7 @@ class Radar : public Snapshot,
 	void internalCreateEvent( const Coord3D *world, RadarEventType type, Real secondsToLive,
 														const RGBAColorInt *color1, const RGBAColorInt *color2 );
 
+	void deleteList( RadarObject **list );
 	void deleteListResources( void );			///< delete list radar resources used
 	Bool deleteFromList( Object *obj, RadarObject **list );	///< try to remove object from specific list
 

Core/GameEngine/Source/Common/System/Radar.cpp

@@ -62,56 +62,33 @@ Radar *TheRadar = NULL;  ///< the radar global singleton
 #define RADAR_QUEUE_TERRAIN_REFRESH_DELAY (LOGICFRAMES_PER_SECOND * 3.0f)
 
 //-------------------------------------------------------------------------------------------------
-/** Delete list resources used by the radar and return them to the memory pools */
 //-------------------------------------------------------------------------------------------------
-void Radar::deleteListResources( void )
+void Radar::deleteList( RadarObject **list )
 {
-	RadarObject *nextObject;
-
-	// delete entries from the local object list
-	while( m_localObjectList )
+	while( *list )
 	{
-
-		// get next object
-		nextObject = m_localObjectList->friend_getNext();
-
-		// remove radar data from object
-		m_localObjectList->friend_getObject()->friend_setRadarData( NULL );
-
-		// delete the head of the list
-		deleteInstance(m_localObjectList);
-
-		// set head of the list to the next object
-		m_localObjectList = nextObject;
-
+		RadarObject *nextObject = (*list)->friend_getNext();
+		(*list)->friend_getObject()->friend_setRadarData( NULL );
+		deleteInstance(*list);
+		*list = nextObject;
 	}
+}
 
-	// delete entries from the regular object list
-	while( m_objectList )
-	{
-
-		// get next object
-		nextObject = m_objectList->friend_getNext();
-
-		// remove radar data from object
-		m_objectList->friend_getObject()->friend_setRadarData( NULL );
-
-		// delete the head of the list
-		deleteInstance(m_objectList);
-
-		// set head of the list to the next object
-		m_objectList = nextObject;
-
-	}
+//-------------------------------------------------------------------------------------------------
+/** Delete list resources used by the radar and return them to the memory pools */
+//-------------------------------------------------------------------------------------------------
+void Radar::deleteListResources( void )
+{
+	deleteList(&m_objectList);
+	deleteList(&m_localObjectList);
 
-	Object *obj;
-	for( obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
+#ifdef DEBUG_CRASHING
+	for( Object *obj = TheGameLogic->getFirstObject(); obj; obj = obj->getNextObject() )
 	{
-
-		DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL, ("oops") );
-
+		DEBUG_ASSERTCRASH( obj->friend_getRadarData() == NULL,
+			("Radar::deleteListResources: Unexpectedly an object still has radar data assigned") );
 	}
-
+#endif
 }
 
 // PUBLIC METHODS /////////////////////////////////////////////////////////////////////////////////