X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/ce61cdfaa7c8472dc83c834fcb15352ed890c059..736353cedce3c9c6916d27a38eb151041f26afd3:/gameserv/tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index b8b2752..b6d4175 100644
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -14,9 +14,11 @@
 
 #include "sockhelp.h"
 #include "options.h"
-#include "list.h"
 #include "aClient.h"
 #include "extern.h"
+#include "flags.h"
+#include "item.h"
+#include "toplist.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -24,27 +26,32 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <algorithm>
+
 //#include <sys/types.h>
 //#include <sys/wait.h>
 //#include <errno.h>
 
-
-
-using std::ofstream;
-using std::ifstream;
-using std::cerr;
-using std::endl;
+using namespace std;
 
 char *PACKAGE = "GameServ";
-char *VERSION = "1.1.8";
+char *VERSION = "1.3.4 +devel";
 
 int sock;
-long timestamp;
+long lastrefresh;
+long lastrollover;
 
-List<aClient> clients;
+list<aClient*> clients[U_TABLE_SIZE];
 
-void save_timestamp();
-void load_timestamp();
+void save_lastrefresh();
+void load_lastrefresh();
+void load_lastrollover();
+void save_lastrollover();
+void prettyIntro();
+void check_idles();
+void clearClients();
+void clearPlayers();
+void clearItems();
 
 // Make this a daemon
 int daemon(int nochdir, int noclose);
@@ -52,165 +59,366 @@ int daemon(int nochdir, int noclose);
 // Close all file descriptors from >= fd
 void closeall(int fd);
 
-int main()
+int main(int argc, char *argv[])
 {
   char buffer[1024], buf[1024];
-  int connected = 1;
-  char *cmd, *source = NULL;
+  memset(buffer, 0, 1024);
+  memset(buf, 0, 1024);
+  int connected;
+  long lastidlecheck;
+  char *cmd, *source = NULL, *conf;
   srand(time(NULL));
+  conf = new char[16];
+  strcpy(conf, "gameserv.conf");
   
-
-  load_config_file();		// default = gameserv.conf
-
-    // Turn into a daemon
-    if (daemon(1,0) < 0)
+  /*
+   * This needs to be fixed to work for any number of arguments in any
+   * order
+   *
+   */
+  if (argc > 1)
+	{
+	  if ( argc > 2 || stricmp(argv[1], "--help") == 0)
+		{
+		  cout << "Usage: gameserv [options] [configfile]" << endl;
+		  cout << "Options:" << endl;
+		  cout << "--help                        Displays this help dialogue" << endl;
+		  delete []conf;
+		  return 1;
+		}
+	  delete []conf;
+	  conf = argv[1];
+	}
+  
+  prettyIntro();
+  
+  if (load_config_file(conf))
+	{
+	  cout << "Config file loaded ok...\n"
+		   << "Turning into a daemon" << endl;
+	}
+  else
+  	exit(2);
+  
+  if (argc <= 1)
+	delete []conf;
+  
+  // Turn into a daemon
+  if (daemon(1,0) < 0)
     {
-        perror("Could not turn into a daemon");
-        exit(2);
+	  perror("Could not turn into a daemon");
+	  exit(3);
     }
-
-  ignore_pipe();
-  sock = make_connection(remoteport, SOCK_STREAM, remoteserver);
-  if (sock == -1) {
-    fprintf(stderr,"make_connection failed.\n");
-    unload_config_file();
-    return -1;
-  }
-
+  if (load_items() == 0)
+    {
+      log("Error loading items");
+      goto end;
+    }
+  
+  if (load_store() == 0)
+    {
+      log("Error loading store");
+      goto end;
+    }
+  if (load_tavern() == 0)
+    {
+      log("Error loading tavern");
+      goto end;
+    }
+  
+  load_gs_dbase();
+  loadNews(newsdata, todaysnews);
+  
+  
+  if (load_masters() == false)
+    {
+      log("Error loading masters");
+      goto end;
+    }
+  
+  if (load_monsters() == false)
+    {
+      log("Error loading monsters");
+      goto end;
+    }
+  
+  if (!load_dragon())
+    {
+      log("Error loading dragon");
+      goto end;
+    }
+  
+  if (load_levels() == false)
+    {
+      log("Error loading levels");
+      goto end;
+    }
+  
+  shuttingdown = false;
+  
+  char ignoreservers[32][256];
+  char *currentserver;
+  currentserver = strtok(ignoreserverslist, " ");
+  for (int server = 0; server < 32 && currentserver != NULL; server++)
+    {
+	  strncpy(ignoreservers[server], currentserver, 255);
+	  log("Placing %s on the server ignore list", currentserver);
+	  currentserver = strtok(NULL, " ");
+    }
+  
+  // This loop will retry the connection 3 times
+  for (int retry = 0; retry < 3 && !shuttingdown; retry++)
+	{
+	  connected = 1;
+	  load_lastrefresh();
+	  load_lastrollover();
+	  
+	  long int loadtime = time(NULL);
+	  long int currentTime;
+	  long int oldTime = loadtime;
+	  
+	  lastidlecheck = loadtime;
+	  
+#ifdef DEBUGMODE
+	  log("Setting primary Idle Check timestamp: %ld", lastidlecheck);
+#endif
+	  bool loaded = false;
+	  
+	  ignore_pipe();
+	  sock = conn(remoteserver, remoteport, localhost, 0);
+	  //    sock = make_connection(remoteport, SOCK_STREAM, remoteserver);
+	  if (sock == -1)
+		{
+		  fprintf(stderr,"make_connection failed.\n");
+		  unload_config_file();
+		  return -1;
+		}
+	  log("<S socket connected.");
+	  
 #ifdef UNREAL
-	raw("PROTOCTL NICKv2 VHP");
-	raw("PASS :%s", remotepass);
-	raw("SERVER %s 1 :%s", servername, servername);
-	raw("NICK %S 1 %d %S %s %s %d +owghraAxNt %s :%s v%s", time(NULL), gshost, 
-		servername, time(NULL), gshost, PACKAGE, VERSION);
-	raw(":%S JOIN %s", c_Forest);
-	raw(":%S MODE %s +mtn", c_Forest);
+	  raw("PASS :%s", remotepass);
+	  raw("SERVER %s 1 :%s", servername, servername);
+	  raw("NICK <S 1 %d %s %s %s %d :%s v%s", time(NULL), gsident, gshost, 
+		  servername, time(NULL), PACKAGE, VERSION);
+	  raw(":<S JOIN %s", c_Forest);
+	  raw(":<S MODE %s +tn", c_Forest);
 #elif defined(BAHAMUT)
-	raw("PASS %s :TS", remotepass);
-	raw("SERVER %s 1 :%s", servername, servername);
-        raw("NICK %S 1 %d +o %s %s %s 0 :GameServ", time(NULL), gsident, gshost, 
-		servername);
-	raw(":%s SJOIN %d %d %s +mnt :@%S", servername, time(NULL), time(NULL), c_Forest);
+	  raw("PASS %s :TS", remotepass);
+	  raw("SERVER %s 1 :%s", servername, servername);
+	  raw("NICK <S 1 %d +w%s %s %s %s 0 :GameServ", time(NULL), (isBOper() ? "o" : ""), 
+		  gsident, gshost, servername);
+	  raw(":%s SJOIN %d %d %s +nt :@<S", servername, time(NULL), time(NULL), c_Forest);
 #elif defined(HYBRID)
-	raw("PASS %s :TS", remotepass);
-	raw("SERVER %s 1 :%s", servername, servername);
-	raw("NICK %S 1 %d +o %s %s %s :GameServ", time(NULL), gsident, gshost,
-		servername);
-	// Sending a timestamp of 1 to force ops.
-	raw(":%s SJOIN 1 %s +ntm :@%S", servername, c_Forest);
+	  raw("PASS %s :TS", remotepass);
+	  raw("SERVER %s 1 :%s", servername, servername);
+	  raw("NICK <S 1 %d +w%s %s %s %s :GameServ", time(NULL), (isBOper() ? "o" : ""), 
+		  gsident, gshost, servername);
+	  raw(":%s SJOIN %ld %s +nt :@<S", servername, time(NULL), c_Forest);
+#elif defined(ULTIMATE2)
+	  raw("PASS %s :TS", remotepass);
+	  raw("SERVER %s 1 :%s", servername, servername);
+	  raw("NICK <S 1 %d %s %s %s 0 :GameServ", 
+		  time(NULL), gsident, gshost, servername);
+	  if (isBOper())
+	    raw(":<S mode <S +o");
+	  raw(":<S JOIN %s", c_Forest);
+#elif defined(PTLINK)
+	  raw("PASS %s :TS", remotepass);
+	  raw("SERVER %s 1 :%s", servername, servername);
+	  raw("NICK <S 1 %d %s%s %s %s %s :GameServ", time(NULL), (isBOper() ? "+iow " : ""), gsident, gshost, gshost, servername);
+	  raw(":%s SJOIN %d %s +nt :@<S", servername, time(NULL), c_Forest);
+#elif defined(VLIFE)
+	  raw("PASS %s :TS", remotepass);
+	  raw("SERVER %s 1 %d :%s", servername, time(NULL), servername);
+	  raw("NNICK <S 1 %d +w%s %s %s %s %s :GameServ", time(NULL),(isBOper() ? "o" : ""), gsident, gshost, gshost, servername);
+	  raw(":%s SJOIN %d %s +nt :@<S", servername, time(NULL), c_Forest);
+#elif defined(BAHAMUT8)
+	  raw("PASS %s :TS", remotepass);
+	  raw("SERVER %s %d :%s", servername, time(NULL), servername);
+	  raw("NICK <S 1 %d +w%s %s %s %s 0 %d :GameServ", time(NULL), (isBOper() ? "o" : ""), gsident, gshost, servername, time(NULL));
+	  raw(":%s SJOIN %d %d %s +nt :@<S", servername, time(NULL), time(NULL), c_Forest);
 #elif defined(P10)
-	// Server numeric is: []  <-- must be unique
-	raw("PASS :%s", remotepass);
-	raw("SERVER %s 1 %d %d P10 []AAF :%s", servername, time(NULL), time(NULL), servername);
-	raw("[] N %S 1 %d %s %s DAqAoB %s :%S", time(NULL), gsident, gshost, gsnum);
-	raw("[] B %s %d +tnm %s:o", c_Forest, time(NULL) - 864000, gsnum);
+	  // Server numeric is: []  <-- must be unique
+	  raw("PASS :%s", remotepass);
+	  raw("SERVER %s 1 %d %d P10 []AAF :%s", servername, time(NULL), time(NULL), servername);
+	  raw("[] N <S 1 %d %s %s %s DAqAoB %s :<S", time(NULL), gsident, gshost,
+		  (isBOper() ? "+o" : ""), gsnum);
+	  raw("[] B %s %d +tn %s:o", c_Forest, time(NULL) - 864000, gsnum);
 #endif
-
+	  
 #if defined(P10)
-	raw("%s T %s :%s", gsnum, c_Forest, c_ForestTopic);
-	raw("[] EB");  // End burst
+	  raw("%s T %s :%s", gsnum, c_Forest, c_ForestTopic);
+	  raw("[] EB");  // End burst
 #else 
 #ifndef HYBRID
-	raw(":%S MODE %s +o %S", c_Forest);
+#if defined(ULTIMATE2)
+	  raw(":%s MODE %s +o <S %ld", servername, c_Forest, 
+		  time(NULL));
+#else
+	  raw(":<S MODE %s +o <S", c_Forest);
 #endif
-	raw(":%S TOPIC %s :%s", c_Forest, c_ForestTopic);
 #endif
-
-  sock_gets(sock,buffer,sizeof(buffer)-1); /* -1 added thanks to
-    David Duchene <dave@ltd.com> for pointing out the possible
-    buffer overflow resulting from the linefeed added below. */
-
-
-  #ifdef DEBUGMODE
+	  raw(":<S TOPIC %s :%s", c_Forest, c_ForestTopic);
+#endif
+	  
+#ifndef P10
+	  if (isUseNickServ())
+		{
+		  raw(":<S PRIVMSG %s :IDENTIFY %s", nsname, nspass);
+		}
+#endif
+	  sock_gets(sock,buffer,sizeof(buffer)-1); /* -1 added thanks to
+												  David Duchene <dave@ltd.com> for pointing out the possible
+												  buffer overflow resulting from the linefeed added below. */
+	  
+	  
+#ifdef DEBUGMODE
       log("Server: %s",buffer);
-  #endif
-
-  init_masters();
-  load_gs_dbase();
-  load_timestamp();
-  long int loadtime = time(NULL);
-  long int currentTime;
-  long int oldTime = loadtime;
-  bool loaded = false;
-
-  if (load_monsters() == false)
-	goto end;
-
-  while (connected) {
-      if (sock_gets(sock,buffer,sizeof(buffer)) == -1) {
-        connected = 0;
-      }
-	strcpy(buf, buffer);
-
-      #if !defined(P10)
-        if (buffer[0] == ':')
-	{
-	    source = strtok(buf, " ");
-	    cmd = strtok(NULL, " ");
-	}
-	else
-	    cmd = strtok(buf, " ");
-      #else
-	    source = strtok(buf, " ");
-	    cmd = strtok(NULL, " ");
-      #endif
-
-	#ifdef DEBUGMODE
-	    log("Server: %s", buffer);
-	#endif
-
-	// Wait N seconds then we're loaded.
-        if (!loaded)
-	{
-	    if (time(NULL) >= welcomedelay + loadtime)
-		loaded = true;
-	}
-
-	// Save the player data every updateperiod seconds
-	currentTime = time(NULL);
-	if (currentTime - oldTime >= updateperiod)
-	{
-	    oldTime = currentTime;
-	    save_gs_dbase();
-	}
+#endif
+	  
+	  while (connected)
+		{
+		  if (sock_gets(sock,buffer,sizeof(buffer)) == -1)
+			{
+			  connected = 0;
+			}
+		  strcpy(buf, buffer);
+		  
+#if !defined(P10)
+		  if (buffer[0] == ':')
+			{
+			  source = strtok(buf, " ");
+			  cmd = strtok(NULL, " ");
+			}
+		  else
+			{
+			  cmd = strtok(buf, " ");
+			}
+#else
+		  source = strtok(buf, " ");
+		  cmd = strtok(NULL, " ");
+#endif
+		  
+#ifdef DEBUGMODE
+		  log("Server: %s", buffer);
+#endif
+		  
+		  // Wait N seconds then we're loaded.
+		  if (!loaded)
+			{
+			  if (time(NULL) >= welcomedelay + loadtime)
+				{
+				  loaded = true;
+				  retry = 0; // Start the reconnection cycle over
+				}
+			}
+		  else
+			{
+			  long TIME = time(NULL);
+			  if (TIME - lastidlecheck >= idlecheckperiod)
+				{
+				  check_idles();
+				  lastidlecheck = TIME;
+				}
+			}
 
+		  // Refresh players and clear news if the time is up
+		  currentTime = time(NULL);
+		  
+		  if (isRolloverForestFights())
+			{
+			  if (currentTime - lastrollover >= rolloverperiod)
+				{
+				  rolloverall();
+				  lastrollover = currentTime;
+				  save_lastrollover();
+				  notice(s_GameServ, c_Forest, "Adding %d forest fights to all players!", numrolloverfights);
+				}
+			}
+		  
+		  if (currentTime - lastrefresh >= refreshperiod)
+			{
+			  refreshall();
+			  clearNews(todaysnews);
+			  saveNews(newsdata, todaysnews);
+			  lastrefresh = currentTime;
+			  save_lastrefresh();
+			  notice(s_GameServ, c_Forest, "Refreshing all players "\
+					 "and resetting news!");
+			}
 
-      #if !defined(P10)
-	if (stricmp(cmd, "PING") == 0) {
-	    char *timestamp;
-	    timestamp = strtok(NULL, "");
-	    raw("PONG %s", timestamp);
-      #else
-	if (stricmp(cmd, "G") == 0) {
-	    char *timestamp;
-	    timestamp = strtok(NULL, " ");
-	    raw("[] Z [] %s 0 %s", timestamp + 1, timestamp);
-      #endif
-	#ifdef P10
-	} else if (stricmp(cmd, "EB") == 0) {
-	    raw("[] EA");
-	#endif
-	} else if (stricmp(cmd, "VERSION") == 0) {
-	    char *server;
-	    server = strtok(NULL, " ");
-	    server++;
-	    raw(":%s 351 %s  %s %s. %s", servername, source+1, PACKAGE, VERSION, servername);
-      #if !defined(P10)
-	} else if (strncmp(cmd, "NICK", 4) == 0) {
-	    if (buffer[0] == ':')
-	    {
-		aClient *tempPtr;
-		if ((tempPtr = find((source + 1))))
-		{
-		    char *nick;
-		    nick = strtok(NULL, " ");
-		    tempPtr->setNick(nick);
-		}
-	    }
-	    else
-	    {
-		char *nick;
-      #else
+		  // Save the player data every updateperiod seconds
+		  if (currentTime - oldTime >= updateperiod)
+			{
+			  oldTime = currentTime;
+			  log("Saving to %s", playerdata);
+			  
+			  save_gs_dbase();
+			  saveNews(newsdata, todaysnews);
+			  if (isSavedNotice())
+				{
+				  // Send notice to the channel of the update
+				  notice(s_GameServ, c_Forest, "<S player data saved");
+				}
+			}
+		  
+		  
+#if !defined(P10)
+		  if (stricmp(cmd, "PING") == 0)
+			{
+			  char *timestamp;
+			  timestamp = strtok(NULL, "");
+			  raw("PONG %s", timestamp);
+			}
+#else
+		  // P10 Ping
+		  if (stricmp(cmd, "G") == 0)
+			{
+			  char *timestamp;
+			  timestamp = strtok(NULL, " ");
+			  raw("[] Z [] %s 0 %s", timestamp + 1, timestamp);
+			}
+#endif
+#ifdef P10
+		  else if (stricmp(cmd, "EB") == 0)
+			{
+			  raw("[] EA");
+			}
+#endif
+		  else if (stricmp(cmd, "VERSION") == 0)
+			{
+			  char *server;
+			  server = strtok(NULL, " ");
+			  server++;
+			  raw(":%s 351 %s %s_%s. %s", servername, source+1, PACKAGE, VERSION, servername);
+			}
+		  // Code indenting is clean up until here!
+#if !defined(P10)
+		  else if (strncmp(cmd, "NICK", 4) == 0
+				   #ifdef VLIFE
+				   || strncmp(cmd, "NNICK", 5) == 0
+				   #endif
+				   )
+			{
+			  if (buffer[0] == ':')
+				{
+				  aClient *tempPtr;
+				  if ((tempPtr = find((source + 1))))
+					{
+					  char *nick;
+					  unsigned long oldhv, newhv;
+					  nick = strtok(NULL, " ");
+					  oldhv = iHASH((unsigned char *) tempPtr->getNick());
+					  newhv = iHASH((unsigned char *) nick);
+					  tempPtr->setNick(nick);
+					  clients[oldhv].remove(tempPtr);
+					  clients[newhv].push_back(tempPtr);
+					}
+				}
+			  else
+				{
+				  char *nick;
+#else
        } else if (stricmp(cmd, "N") == 0 && strlen(source) == 2) {
 	    {	
 		char *nick, *realnick;
@@ -221,10 +429,9 @@ int main()
 
 		if (nick[0] == '+')
 		{
-		    #ifdef DEBUGMODE
+#ifdef DEBUGMODE
 		    log ("aClient has modes");
-		    #endif
-
+#endif
 		    // Searching for the +r mode (extra parameter)
 		    for (unsigned int count = 1; count < strlen(nick); count++)
 		    {
@@ -236,87 +443,167 @@ int main()
 		    }
 		    nick = strtok(NULL, " ");
 		}
-      #endif
+#endif
 		aClient *newuser;
 
 		nick = strtok(NULL, " ");
 
-		#ifdef P10
+#ifdef P10
 		    newuser = new aClient(nick, realnick);
-		#else
+#else
 		    newuser = new aClient(nick);
-		#endif
-
+#endif
 
-		if (loaded)
-		#ifdef P10
-		    notice(s_GameServ, nick, welcomemsg, realnick);
-		#else
-		    notice(s_GameServ, nick, welcomemsg, nick);
-		#endif
 
-		clients.insertAtBack(newuser);
-		delete newuser;
+			if (loaded)
+			  if (isWelcome())
+				{
+#ifdef P10
+				  notice(s_GameServ, nick, welcomemsg, realnick);
+#else
+				  notice(s_GameServ, nick, welcomemsg, nick);
+#endif
+				}
+#ifdef P10
+		    unsigned long hv = sHASH((unsigned char *) nick);
+#else
+		    unsigned long hv = iHASH((unsigned char *) nick);
+#endif
+			
+#if defined(HYBRID) || defined(BAHAMUT) || defined(ULTIMATE2) || defined(PTLINK)
+		char *nickserver;
+		strtok(NULL, " ");
+		strtok(NULL, " ");
+		nickserver = strtok(NULL, " ");
+		if (nickserver[0] == '+')
+		  strtok(NULL, " ");
+		strtok(NULL, " ");
+		nickserver = strtok(NULL, " ");
+		for (int x = 0; x < 32; x++)
+		  {
+			if (stricmp(ignoreservers[x], nickserver) == 0)
+			  {
+			    setIgnore(newuser);
+			    break;
+			  }
+		  }
+#elif defined(UNREAL)
+		char *nickserver;
+		strtok(NULL, " ");
+		strtok(NULL, " ");
+		strtok(NULL, " ");
+		strtok(NULL, " ");
+		nickserver = strtok(NULL, " ");
+		for (int x = 0; x < 32; x++)
+		  {
+			if (stricmp(ignoreservers[x], nickserver) == 0)
+			  {
+			    setIgnore(newuser);
+			    break;
+			  }
+		  }
+#endif
+		clients[hv].push_back(newuser);
 	    }
-      #if defined(P10)
+#if defined(P10)
 	} else if (stricmp(cmd, "Q") == 0) {
-      #else
-	} else if (stricmp(cmd, "QUIT") == 0) {
-      #endif
-	    aClient *quitter;
-	    char z = source[0];
+//	    unsigned long hv = sHASH((unsigned char *) source);
+#else
+	} else if (stricmp(cmd, "QUIT") == 0)
+	  {
 
-	    if (z == ':')
-		source++;
-
-	    if ((quitter = find(source)))
-		clients.remove(quitter);
-	    if ((quitter = findIRCplayer(source)))
-	    {
-		quitter->setNick("!NULL!");
-		quitter->stats->user = NULL; // Unidentify them
-	    }
+#endif
+		aClient *quitter;
+		char z = source[0];
 
 	    if (z == ':')
-		source--;
+		  source++;
 
-      #if defined(P10)
-	} else if (stricmp(cmd, "P") == 0) {
-	    char *rest, *dest;
-	    char *longname;
-	    longname = new char[strlen(s_GameServ) + strlen(servername) + 2];
+		unsigned long hv = iHASH((unsigned char *) source);		
+	    if (!(quitter = find(source)))
+		  {
+			log("Fatal Error: could not find %s in the "\
+				"clients list", source);
+			goto end;
+		  }
 
-	    sprintf(longname, "%S@%s", servername);
+		clients[hv].remove(quitter);
+		logout(quitter);
 
-	    dest = strtok(NULL, " ");
-	    rest = strtok(NULL, "");
-	    if (stricmp(dest, gsnum) == 0 || stricmp(dest, longname) == 0)
-	    {
-		delete [] longname;
-		gameserv(source, rest);
-	    }
-	    else if (stricmp(dest, c_Forest) == 0)
-	    {
-		delete [] longname;
-		forest(source, rest);
-	    }
-      #else
-	} else if (stricmp(cmd, "PRIVMSG") == 0) {
+		delete quitter;
+		
+	    if (z == ':')
+		  source--;
+
+#if defined(P10)
+	  }
+	else if (stricmp(cmd, "P") == 0)
+	  {
+		char *rest, *dest;
+		char *longname;
+		longname = new char[strlen(s_GameServ) + strlen(servername) + 2];
+		
+		sprintf(longname, "<S@%s", servername);
+		
+		dest = strtok(NULL, " ");
+		rest = strtok(NULL, "");
+		if (stricmp(dest, gsnum) == 0 || stricmp(dest, longname) == 0)
+		  {
+			delete [] longname;
+			gameserv(source, rest);
+		  }
+		else if (stricmp(dest, c_Forest) == 0 && isListenOnCF())
+		  {
+			delete [] longname;
+			forest(source, rest);
+		  }
+#else
+	  }
+	else if (stricmp(cmd, "PRIVMSG") == 0)
+	  {
 	    char *rest, *dest;
 	    dest = strtok(NULL, " ");
 	    rest = strtok(NULL, "");
 	    if (strnicmp(dest, s_GameServ, strlen(s_GameServ)) == 0)
-		gameserv(source, rest);
-	    else if (stricmp(dest, c_Forest) == 0)
-		forest(source, rest);
-      #endif
+		  gameserv(source, rest);
+	    else if (stricmp(dest, c_Forest) == 0 && isListenOnCF())
+		  forest(source, rest);
+#endif
+#if defined(P10)
+	} else if (stricmp(cmd, "J") == 0) {
+#else
 	} else if (stricmp(cmd, "JOIN") == 0) {
+#endif
 	    char *channel;
+	    aClient *joiner;
 	    channel = strtok(NULL, " ");
-	    if (stricmp(channel, c_Forest) == 0 && is_playing(source + 1))
-		raw(":%S MODE %s +v %s", c_Forest, (source + 1));
 
-	#if defined(BAHAMUT)
+            char z = source[0];
+
+            if (z == ':')
+                source++;
+
+		joiner = find(source);
+
+	    if (stricmp(channel, c_Forest) == 0 && is_playing(joiner))
+	    {
+#ifdef DEBUGMODE
+		  log("Player %s (IRC: %s) joined %s", 
+			  joiner->stats->getName().c_str(), 
+#ifdef P10
+			  joiner->getRealNick(),
+#else
+			  joiner->getNick(),
+#endif
+			  c_Forest);
+#endif
+		  raw(":<S MODE %s +v %s", c_Forest, (source));
+	    }
+
+	    if (z == ':')
+		source--;
+
+#if defined(BAHAMUT)
 	} else if (stricmp(cmd, "SJOIN") == 0) {
 	    char *channel, *nick, *tmp, *rest;
 	    strtok(NULL, " "); // Ignore the TS
@@ -336,29 +623,33 @@ int main()
                    nick++; // Assume for users set op and voice, they
                             // are never passed as +@nick
                if (stricmp(channel, c_Forest) == 0 && is_playing(nick))
-                   raw(":%S MODE %s +v %s", channel, nick);
+                   raw(":<S MODE %s +v %s", channel, nick);
 
                nick = strtok(NULL, " ");
            }
 #endif
 	} else {
-	    #ifdef DEBUGMODE
+#ifdef DEBUGMODE
 		log("Unrecognized Message: cmd = %s   source = %s", cmd, source);
-	    #endif
+#endif
 	}
   }
 
+ } // for loop for connection retry
+
   end:
 
   save_gs_dbase();
-  save_timestamp();
-
+  save_dragon();
+  saveNews(newsdata, todaysnews);
+  clearClients();
+  clearPlayers();
+  clearItems();
   delete_monsters();
-  delete_masters();
 
-  #ifdef DEBUGMODE
+#ifdef DEBUGMODE
       log("<CLOSED>");
-  #endif
+#endif
 
   close(sock);
   unload_config_file();
@@ -380,7 +671,8 @@ aClient *find(const char *nick)
 aClient *findbyrealnick(char *realnick)
 {
    ListNode <aClient> *newPtr;
-    newPtr = clients.First();
+   unsigned long hv = sHASH((unsigned char *) realnick);
+    newPtr = clients[hv].First();
 
     aClient *client = NULL;
 
@@ -394,132 +686,119 @@ aClient *findbyrealnick(char *realnick)
     }
     return client;    
 }
-#endif
 
-aClient *findbynick(char *nick)
-{
-    ListNode <aClient> *newPtr;
-    newPtr = clients.First();
+#else
 
-    aClient *client = NULL;
-
-    while (newPtr)
-    {
-	client = newPtr->getData();
-	#ifdef P10
-	    if (strcmp(client->getNick(), nick) == 0)
-	#else
-	    if (stricmp(client->getNick(), nick) == 0)
-	#endif
-	    return client;
-	client = NULL;
-	newPtr = newPtr->Next();
-    }
-    return client;    
+aClient *findbyrealnick(char *realnick)
+{
+  return findbynick(realnick);
 }
 
-aClient *findIRCplayer(const char *nick)
-{
-    ListNode <aClient> *newPtr;
-    aClient *p = NULL;
+#endif
 
-    for (newPtr = players.First(); newPtr; newPtr = newPtr->Next())
-    {
-	p = newPtr->getData();
-	#ifdef P10
-	    if (strcmp(p->getNick(), nick) == 0)
-	#else
-	    if (stricmp(p->getNick(), nick) == 0)
-	#endif
-	    return p;
-	p = NULL;
-    }
-    return NULL;
-}
-aClient *findplayer(const char *name)
+aClient *findbynick(char *nick)
 {
-    ListNode <aClient> *newPtr;
-    Player *p = NULL;
+  list<aClient*>::iterator iter;
+#ifdef P10
+  unsigned long hv = sHASH((unsigned char *) nick);
+#else
+  unsigned long hv = iHASH((unsigned char *) nick);
+#endif
 
-    for (newPtr = players.First(); newPtr; newPtr = newPtr->Next())
+  aClient *client = NULL;
+  
+  for(iter = clients[hv].begin(); iter != clients[hv].end(); iter++)
     {
-	p = newPtr->getData()->stats;
-	if (stricmp(p->name, name) == 0)
-	    return newPtr->getData();
-	p = NULL;
+	  client = (*iter);
+#ifdef P10
+	  if (strcmp(client->getNick(), nick) == 0)
+		{
+#else
+	  if (stricmp(client->getNick(), nick) == 0)
+		{
+#endif
+		  return client;
+		}
+	  client = NULL;
     }
-    return NULL;
+	return client;
 }
 
-aClient *findbynick(const char *nick)
+Player *findplayer(const char *name)
 {
-    ListNode <aClient> *newPtr;
-    newPtr = clients.First();
-
-    aClient *client = NULL;
-
-    while (newPtr)
+  list<Player*>::iterator iter;
+  Player *p;
+  unsigned long hv = iHASH((unsigned char *) name);
+  for (iter = players[hv].begin(); iter != players[hv].end(); iter++)
     {
-	client = newPtr->getData();
-	#ifdef P10
-	    if (strcmp(client->getNick(), nick) == 0)
-	#else
-	    if (stricmp(client->getNick(), nick) == 0)
-	#endif
-	    return client;
-	client = NULL;
-	newPtr = newPtr->Next();
+	  p = (*iter);
+	  if (stricmp(p->getName().c_str(), name) == 0)
+	    return p;
+	  p = NULL;
     }
-    return client;    
+  return NULL;
 }
 
-void load_timestamp()
+void check_idles()
 {
-    ifstream infile;
-
-    infile.open(".gstimestamp");
-
-    if (infile.fail())
+  list<Player*>::iterator iter;
+  Player *p;
+  
+  for (int x = 0; x < U_TABLE_SIZE; x++)
     {
-	#ifdef DEBUGMODE
-	    log("Error opening .gstimestamp");
-	#endif
+	  for (iter = players[x].begin(); iter != players[x].end(); iter++)
+		{
+		  p = (*iter);
 
-	generate:
-        #ifdef DEBUGMODE
-	    log("Generating new timestamp");
-	#endif
-	timestamp = midnight();
-        save_timestamp();
-	return;
+		  switch(p->getLevel())
+			{
+			case 1:
+			  if ((time(NULL) - p->lastlogin) / 86400 >= level1expire)
+				{
+				  logout(p->getClient());
+				  return;
+				}
+			  break;
+			  
+			default:
+			  if ((time(NULL) - p->lastlogin) / 86400 >= defaultexpire)
+				{
+				  logout(p->getClient());
+				  return;
+				}
+			  break;
+			}
+		  if (timedOut(p))
+			{
+			  timeOutEvent(p);
+			}
+		}
     }
-
-    infile >> timestamp;
-    infile.close();
-    if (timestamp < 1000000)
-	goto generate;
 }
 
-void save_timestamp()
+aClient *findbynick(const char *nick)
 {
-    ofstream outfile;
-
-    outfile.open(".gstimestamp");
-
-    if (outfile.fail())
+  list<aClient*>::iterator iter;
+#ifdef P10
+  unsigned long hv = sHASH((unsigned char *) nick);
+#else
+  unsigned long hv = iHASH((unsigned char *) nick);
+#endif
+  
+  aClient *client = NULL;
+  
+  for (iter = clients[hv].begin(); iter != clients[hv].end(); iter++)
     {
-	log("Error creating new file .gstimestamp");
-	return;
+	  client = (*iter);
+#ifdef P10
+	  if (strcmp(client->getNick(), nick) == 0)
+#else
+	    if (stricmp(client->getNick(), nick) == 0)
+#endif
+		  return client;
+	  client = NULL;
     }
-
-    outfile << timestamp << endl;
-
-    outfile.close();
-}
-
-long int midnight(long int offset)
-{
-    return (time(NULL) - (time(NULL) % 86400)) + (offset * 3600);
+  return client;    
 }
 
 /* daemon() - detach process from user and disappear into the background
@@ -552,9 +831,9 @@ int daemon(int nochdir, int noclose)
         case -1: return -1;
         default: 
 		ofstream outfile;
-		outfile.open("gameserv.pid");
+		outfile.open(pidfile);
     		if (outfile.fail())
-		    cerr << "Unable to open gameserv.pid" << endl;
+		    cerr << "Unable to open " << pidfile << endl;
 		outfile << pid << endl;
     		outfile.close();
 
@@ -585,4 +864,142 @@ void closeall(int fd)
       close(fd++);
 }
 
+void prettyIntro()
+{
+  cout << endl;
+  cout << "  GGGG     AAA   MM    MM EEEEEEE  SSSSS  EEEEEEE RRRRRR  VV     VV " << endl;
+  cout << " GG  GG   AAAAA  MMM  MMM EE      SS      EE      RR   RR VV     VV " << endl;
+  cout << "GG       AA   AA MM MM MM EEEEE    SSSSS  EEEEE   RRRRRR   VV   VV  " << endl;
+  cout << "GG   GGG AAAAAAA MM    MM EE           SS EE      RR  RR    VV VV   " << endl;
+  cout << "G     G  AA   AA MM    MM EEEEEEE  SSSSS  EEEEEEE RR   RR    VVV" << endl;
+  cout << " GGGGG                                                        V\n\n" << endl;
+  cout << "Version: " << VERSION << endl;
+  cout << "http://www.gameserv.us - http://www.sourceforge.net/projects/gameservirc" << endl;
+}
+
+void load_lastrefresh()
+{
+    ifstream infile;
+    infile.open(".gsrefresh");
+    if (infile.fail())
+    {
+#ifdef DEBUGMODE
+	    log("Error opening .gsrefresh");
+#endif
+
+	generate:
+	long mytime = time(NULL);
+#ifdef DEBUGMODE
+	    log("Generating new refresh time");
+#endif
+
+	// Just a safety measure... tho no one should
+	// get anywhere near the actual time as their refreshperiod
+	if (refreshperiod >= mytime)
+	  {
+	    log("Refresh period is greater than or equal to the actual time... setting it to 86400");
+	    refreshperiod = 86400;
+	  }
+	
+	lastrefresh = mytime - (mytime % refreshperiod);
+
+	refreshall();
+	save_lastrefresh();
+	return;
+    }
+    infile >> lastrefresh;
+
+    infile.close();
+    if (lastrefresh < 0)
+	goto generate;
+}
+
+void load_lastrollover()
+{
+  ifstream infile;
+  infile.open(".gsrollover");
+  if (infile.fail())
+    {
+#ifdef DEBUGMODE
+      log("Error opening .gsrollover");
+#endif
+      
+    generate:
+      long mytime = time(NULL);
+#ifdef DEBUGMODE
+      log("Generating new rollover time");
+#endif
+      lastrollover = mytime;
+      return;
+    }
+  infile >> lastrollover;
+  
+  infile.close();
+  if (lastrollover < 0)
+    goto generate;
+}
 
+void save_lastrefresh()
+{
+    ofstream outfile;
+
+    outfile.open(".gsrefresh");
+
+    if (outfile.fail())
+    {
+	log("Error creating new file .gsrefresh");
+	return;
+    }
+    outfile << lastrefresh << endl << lastrollover;
+
+    outfile.close();
+}
+
+void save_lastrollover()
+{
+    ofstream outfile;
+
+    outfile.open(".gsrollover");
+
+    if (outfile.fail())
+    {
+	log("Error creating new file .gsrollover");
+	return;
+    }
+    outfile << lastrollover << endl;
+    outfile.close();
+}
+void clearItems()
+{
+  list<item*>::iterator iter;
+  for (iter = Items.begin(); iter != Items.end(); iter++)
+	{
+	  delete (*iter);
+	  Items.erase(iter);
+	}
+}
+void clearClients()
+{
+  list<aClient*>::iterator iter;
+  for (unsigned long x = 0; x < U_TABLE_SIZE; x++)
+	{
+	  for (iter = clients[x].begin(); iter != clients[x].end(); iter++)
+		{
+		  delete (*iter);
+		  clients[x].erase(iter);
+		}
+	}
+}
+
+void clearPlayers()
+{
+  list<Player*>::iterator iter;
+  for (unsigned long x = 0; x < U_TABLE_SIZE; x++)
+	{
+	  for (iter = players[x].begin(); iter != players[x].end(); iter++)
+		{
+		  delete (*iter);
+		  players[x].erase(iter);
+		}
+	}
+}