Updated TODO and fixed the hashing algorithm for P10 numerics + others' nickname...

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

diff --git a/gameserv/list.h b/gameserv/list.h
index 01b28fa660d4cd37a144a1d22b0a31cac94d14c8..d19e5564614454726289ca9b41a7bd936816c83b 100644 (file)
--- a/gameserv/list.h
+++ b/gameserv/list.h
@@ -1,10 +1,16 @@
 #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 {
@@ -15,7 +21,8 @@ class List {
        void insertAtBack( T *&);
        bool removeFromFront( T & );
        bool removeFromBack( T & );
-       bool remove( T * );
+       bool del( T *);
+       ListNode < T > *remove( T * );
        bool isEmpty() const;
        void print() const;
        ListNode < T > *Find( T * );
@@ -36,7 +43,9 @@ List<T>::~List()
 {
     if (!isEmpty())
     {
-       cout << "Destroying Nodes" << endl;
+       #ifdef DEBUGMODE
+           log("Destroying Nodes");
+       #endif
 
        ListNode<T> *currentPtr = firstPtr, *tempPtr;
 
@@ -44,14 +53,16 @@ List<T>::~List()
        {
            tempPtr = currentPtr;
            currentPtr = currentPtr->Next();
-//         if (!tempPtr->getData()->stats || tempPtr->getData()->stats->started == 0)
-           cout << "Deleting Memory address: " << tempPtr->getData() << endl << flush;
+
+           #ifdef DEBUGMODE
+               log("Deleting Memory address: %s", tempPtr->getData());
+           #endif
            
                delete tempPtr;
-//         else
-//             tempPtr->getData()->stats->started = 0;
        }
-       cout << "All Nodes destroyed" << endl;
+       #ifdef DEBUGMODE
+           log("All Nodes destroyed");
+       #endif
     }
 }
 
@@ -159,6 +170,7 @@ ListNode<T> *List<T>::Find( T *value )
     return NULL;
 }
 
+#ifdef DEBUGMODE
 template <class T>
 void List<T>::print() const
 {
@@ -172,19 +184,31 @@ void List<T>::print() const
     currentPtr = firstPtr;
     while (currentPtr)
     {
-       cout << "aClient: " << currentPtr->getData() << flush;
+       cout << "aClient: " << *currentPtr->getData() << flush;
 
         if (currentPtr->getData()->stats)
-           cout << "  Player Name: " << &currentPtr->getData()->stats->name 
-                << "   Password: " << &currentPtr->getData()->stats->password << flush;
+           cout << "  Player Name: " << currentPtr->getData()->stats->name 
+                << "   Password: " << currentPtr->getData()->stats->password << flush;
        cout << endl;
        currentPtr = currentPtr->next;
     }
+}
+#endif
 
+template <class T>
+bool List<T>::del(T *remPtr)
+{
+    ListNode<T> *removed = remove( remPtr );
+    if (removed != NULL)
+    {
+       delete removed;
+       return true;
+    }
+    return false;
 }
 
 template <class T>
-bool List<T>::remove(T *remPtr)
+ListNode<T> *List<T>::remove(T *remPtr)
 {
     ListNode<T> *newPtr = firstPtr;
     T *testPtr;
@@ -199,41 +223,42 @@ bool List<T>::remove(T *remPtr)
        {
            if (firstPtr == lastPtr)
            {
-               cout << "One Element. Deleting it" << endl << flush;
+               #ifdef DEBUGMODE
+                   log("One Element. Deleting it");
+               #endif
                firstPtr = lastPtr = NULL;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
            else if (newPtr != lastPtr && newPtr != firstPtr)
            {
-               cout << "Many elements, this one is in the middle. Deleting it"
-                    << ", linking front to back, and back to front." << endl << flush;
+               #ifdef DEBUGMODE
+                   log("Many elements, this one is in the middle. Deleting it, linking front to back, and back to front.");
+               #endif
                newPtr->prev->next = newPtr->next;
                newPtr->next->prev = newPtr->prev;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
            else if (newPtr == lastPtr)
            {
-               cout << "This was the last element. Deleting it, and pointing the tail to "
-                    << "its previous element." << endl << flush;
+               #ifdef DEBUGMODE
+                   log("This was the last element. Deleting it, and pointing the tail to its previous element.");
+               #endif
                lastPtr = newPtr->prev;
                lastPtr->next = 0;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
            else if (newPtr == firstPtr)
            {
-               cout << "This was the first element. Deleting it, and pointing the head to "
-                    << "its next element." << endl << flush;
+               #ifdef DEBUGMODE
+                   log("This was the first element. Deleting it, and pointing the head to its next element.");
+               #endif
                firstPtr = newPtr->next;
                firstPtr->prev = 0;
-               delete newPtr;
-               return true;
+               return newPtr;
            }
        }
        newPtr = newPtr->next;
     }
-    return false;
+    return NULL;
 }
 #endif