X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/ae2685f6460ca012d2346ac912c16c23e032a4aa..42106907f7ad612248bbcb1bf7515effe29e04c5:/gameserv/list.h?ds=sidebyside

diff --git a/gameserv/list.h b/gameserv/list.h
index 4053e4a..9fee007 100644
--- a/gameserv/list.h
+++ b/gameserv/list.h
@@ -5,7 +5,6 @@
 #include <cassert>
 #include "listnode.h"
 #include "aClient.h"
-#include "extern.h"
 #include "options.h"
 
 using std::cout;
@@ -19,52 +18,69 @@ class List {
 	~List();	//deconstructor
 	T *insertAtFront( const T & );
 	T *insertAtBack( T *&);
+	T *random(); // Returns a random element in the list
 	ListNode<T> *insertAtBack_RLN( T *&);
 	bool removeFromFront( T & );
 	bool removeFromBack( 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; };
+	int elements; // Number of elements in the list
     private:
 	ListNode < T > *firstPtr;
 	ListNode < T > *lastPtr;
 
 	ListNode < T > *getNewNode ( const T &  );
+	ListNode < T > *getNewNode ( T &  );
 };
 
 template <class T>
-List<T>::List() : firstPtr (0), lastPtr (0) {}
+List<T>::List() : firstPtr (0), lastPtr (0) {elements = 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
+	tempPtr = it;
+	it = it->Next();
+	delete tempPtr;
+    }
+    firstPtr = NULL;
+    lastPtr = NULL;
+    elements = 0;
+}
 
-	ListNode<T> *currentPtr = firstPtr, *tempPtr;
+template <class T>
+List<T>::~List()
+{
+    deleteNodes();
+}
 
-	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
+template<class T>
+T *List<T>::random()
+{
+    if (isEmpty())
+	return NULL;
+
+    int num = rand() % elements;
+    ListNode<T> *it = firstPtr;
+    for (int x = 0; x < num; x++)
+    {
+	it = it->Next();
     }
+    return it->getData();
 }
 
 template<class T>
@@ -81,6 +97,7 @@ T *List<T>::insertAtFront( const T &value )
 	firstPtr->prev = newPtr;
 	firstPtr = newPtr;
     }
+    elements++;
     return firstPtr->getData();
 }
 
@@ -99,6 +116,7 @@ T *List<T>::insertAtBack(T *&value )
 	lastPtr->next = newPtr;
 	lastPtr = newPtr;
     }
+    elements++;
     return lastPtr->getData();
 }
 
@@ -117,6 +135,7 @@ ListNode<T> *List<T>::insertAtBack_RLN(T *&value )
 	lastPtr->next = newPtr;
 	lastPtr = newPtr;
     }
+    elements++;
     return lastPtr;
 }
 
@@ -137,6 +156,7 @@ bool List<T>::removeFromFront( T &value )
 
 	value = tempPtr->getData();
 	delete tempPtr;
+	elements--;
 	return true;
     }
 }
@@ -157,8 +177,8 @@ bool List<T>::removeFromBack( T &value )
 
 	value = tempPtr->getData();
 	delete tempPtr;
+	elements--;
 	return true;
-
     }
 }
 
@@ -175,6 +195,17 @@ ListNode<T> *List<T>::getNewNode( const T &value)
 
     return ptr;
 }
+
+template <class T>
+ListNode<T> *List<T>::getNewNode( T &value)
+{
+    ListNode<T> *ptr = new ListNode<T>(value);
+
+    assert( ptr != 0);
+
+    return ptr;
+}
+
 template<class T>
 ListNode<T> *List<T>::Find( T *value )
 {
@@ -206,12 +237,28 @@ 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;
+	*/
+	T *dat;
+	dat = currentPtr->getData();
+	log("name: %s", dat->name);
+	log("weapon: %s", dat->weapon);
+	log("death: %s", dat->death);
+	log("strength: %d", dat->strength);
+	log("exp: %ld", dat->exp);
+	log("gold: %ld", dat->gold);
+	log("maxhp: %d", dat->maxhp);
+	log("hp: %d", dat->hp);
 	currentPtr = currentPtr->next;
     }
 }
@@ -278,6 +325,7 @@ ListNode<T> *List<T>::remove(T *remPtr)
 		firstPtr->prev = 0;
 		return newPtr;
 	    }
+	    elements--;
 	}
 	newPtr = newPtr->next;
     }