Fixed a core bug hopefully

[irc/gameservirc.git] / gameserv / list.h

diff --git a/gameserv/list.h b/gameserv/list.h
index 5469257ce90da415c23ec89043fcc9cad6fdde84..e8b85100a499257851ef69a1c224abf924af2adb 100644 (file)
--- a/gameserv/list.h
+++ b/gameserv/list.h
@@ -1,24 +1,35 @@
 #ifndef LIST_H
 #define LIST_H
 
-#include <iostream.h>
+#include <iostream>
 #include <cassert>
 #include "listnode.h"
 #include "aClient.h"
 #include "extern.h"
+#include "options.h"
+
+using std::cout;
+using std::endl;
+using std::flush;
 
 template <class T>
 class List {
     public:
        List();         //constructor
        ~List();        //deconstructor
-       void insertAtFront( const T & );
-       void insertAtBack( T *&);
+       T *insertAtFront( const T & );
+       T *insertAtBack( T *&);
+       ListNode<T> *insertAtBack_RLN( T *&);
        bool removeFromFront( T & );
        bool removeFromBack( T & );
-       bool remove( T * );
+       bool del( T *);
+       ListNode < T > *remove( T * );
        bool isEmpty() const;
+       #ifdef DEBUGMODE
        void print() const;
+       #endif
+        void deleteNodes();
+
        ListNode < T > *Find( T * );
         ListNode < T > *First() { return firstPtr; };
        ListNode < T > *Last() { return lastPtr; };
@@ -33,35 +44,29 @@ 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>
-void List<T>::insertAtFront( const T &value )
+T *List<T>::insertAtFront( const T &value )
 {
     ListNode<T> *newPtr = getNewNode ( value );
 
@@ -74,10 +79,29 @@ void List<T>::insertAtFront( const T &value )
        firstPtr->prev = newPtr;
        firstPtr = newPtr;
     }
+    return firstPtr->getData();
+}
+
+template<class T>
+T *List<T>::insertAtBack(T *&value )
+{
+    ListNode<T> *newPtr = getNewNode(*value);
+
+    if (isEmpty())
+    {
+       firstPtr = lastPtr = newPtr;
+    }
+    else
+    {
+       newPtr->prev = lastPtr;
+       lastPtr->next = newPtr;
+       lastPtr = newPtr;
+    }
+    return lastPtr->getData();
 }
 
 template<class T>
-void List<T>::insertAtBack(T *&value )
+ListNode<T> *List<T>::insertAtBack_RLN(T *&value )
 {
     ListNode<T> *newPtr = getNewNode(*value);
 
@@ -91,6 +115,7 @@ void List<T>::insertAtBack(T *&value )
        lastPtr->next = newPtr;
        lastPtr = newPtr;
     }
+    return lastPtr;
 }
 
 
@@ -157,6 +182,7 @@ ListNode<T> *List<T>::Find( T *value )
     currentPtr = firstPtr;
     while (currentPtr)
     {
+       cout << currentPtr->getData() << endl << value << endl;
        if (currentPtr->getData() == value)
            return currentPtr;
        currentPtr = currentPtr->Next();
@@ -178,20 +204,34 @@ void List<T>::print() const
     currentPtr = firstPtr;
     while (currentPtr)
     {
+       /*
        cout << "aClient: " << *currentPtr->getData() << flush;
 
         if (currentPtr->getData()->stats)
            cout << "  Player Name: " << currentPtr->getData()->stats->name 
                 << "   Password: " << currentPtr->getData()->stats->password << flush;
        cout << endl;
+       */
+       cout << currentPtr->getData()->getString() << endl;
        currentPtr = currentPtr->next;
     }
-
 }
 #endif
 
 template <class T>
-bool List<T>::remove(T *remPtr)
+bool List<T>::del(T *remPtr)
+{
+    ListNode<T> *removed = remove( remPtr );
+    if (removed != NULL)
+    {
+       delete removed;
+       return true;
+    }
+    return false;
+}
+
+template <class T>
+ListNode<T> *List<T>::remove(T *remPtr)
 {
     ListNode<T> *newPtr = firstPtr;
     T *testPtr;
@@ -210,8 +250,7 @@ bool List<T>::remove(T *remPtr)
                    log("One Element. Deleting it");
                #endif
                firstPtr = lastPtr = NULL;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
            else if (newPtr != lastPtr && newPtr != firstPtr)
            {
@@ -220,8 +259,7 @@ bool List<T>::remove(T *remPtr)
                #endif
                newPtr->prev->next = newPtr->next;
                newPtr->next->prev = newPtr->prev;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
            else if (newPtr == lastPtr)
            {
@@ -230,8 +268,7 @@ bool List<T>::remove(T *remPtr)
                #endif
                lastPtr = newPtr->prev;
                lastPtr->next = 0;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
            else if (newPtr == firstPtr)
            {
@@ -240,12 +277,11 @@ bool List<T>::remove(T *remPtr)
                #endif
                firstPtr = newPtr->next;
                firstPtr->prev = 0;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
        }
        newPtr = newPtr->next;
     }
-    return false;
+    return NULL;
 }
 #endif