X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/c260a8d7699447c74d9a9ee8912582cc8814cec2..152a0a938610357511cebd78a2af02b0718d75d1:/gameserv/list.h

diff --git a/gameserv/list.h b/gameserv/list.h
index d49c0d9..e8b8510 100644
--- a/gameserv/list.h
+++ b/gameserv/list.h
@@ -28,6 +28,7 @@ class List {
 	#ifdef DEBUGMODE
 	void print() const;
 	#endif
+        void deleteNodes();
 
 	ListNode < T > *Find( T * );
         ListNode < T > *First() { return firstPtr; };
@@ -43,31 +44,25 @@ template <class T>
 List<T>::List() : firstPtr (0), lastPtr (0) {}
 
 template <class T>
-List<T>::~List()
+void List<T>::deleteNodes()
 {
-    if (!isEmpty())
+    if (isEmpty())
+	return;
+    ListNode<T> *it = firstPtr, *tempPtr;
+    while (it)
     {
-	#ifdef DEBUGMODE
-	    log("Destroying Nodes");
-	#endif
-
-	ListNode<T> *currentPtr = firstPtr, *tempPtr;
-
-	while (currentPtr) 
-	{
-	    tempPtr = currentPtr;
-	    currentPtr = currentPtr->Next();
-
-	    #ifdef DEBUGMODE
-		log("Deleting Memory address: %s", tempPtr->getData());
-	    #endif
-	    
-		delete tempPtr;
-	}
-	#ifdef DEBUGMODE
-	    log("All Nodes destroyed");
-	#endif
+	tempPtr = it;
+	it = it->Next();
+	delete tempPtr;
     }
+    firstPtr = NULL;
+    lastPtr = NULL;
+}
+
+template <class T>
+List<T>::~List()
+{
+    deleteNodes();
 }
 
 template<class T>