X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/69fb5a933479d9fd985370e7fb381465bfefa99c..016a160fafb037639d840c29dfede4b73ce52109:/gameserv/tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index a77226c..6662560 100644
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -29,15 +29,13 @@
 //#include <sys/wait.h>
 //#include <errno.h>
 
-
-
 using std::ofstream;
 using std::ifstream;
 using std::cerr;
 using std::endl;
 
 char *PACKAGE = "GameServ";
-char *VERSION = "1.2.1 +devel";
+char *VERSION = "1.2.2 +devel";
 
 int sock;
 int day;
@@ -57,11 +55,15 @@ void closeall(int fd);
 
 int main(int argc, char *argv[])
 {
-  char buffer[1024], buf[1024];
-  int connected;
-  long lastidlecheck;
-  char *cmd, *source = NULL, *conf = "gameserv.conf";
-  srand(time(NULL));
+    char buffer[1024], buf[1024];
+    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");
 
   /*
    * This needs to be fixed to work for any number of arguments in any
@@ -77,8 +79,8 @@ int main(int argc, char *argv[])
 	    cout << "--help                        Displays this help dialogue" << endl;
 	    return 1;
 	}
-	conf = new char[strlen(argv[1])];
-	strcpy(conf, argv[1]);
+	delete []conf;
+	conf = argv[1];
   }
 
   prettyIntro();
@@ -91,6 +93,9 @@ int main(int argc, char *argv[])
   else
   	exit(2);
 
+    if (argc <= 1)
+	delete []conf;
+
     // Turn into a daemon
     if (daemon(1,0) < 0)
     {
@@ -117,9 +122,11 @@ int main(int argc, char *argv[])
 
   strcpy(boss.name, "Red Dragon");
   strcpy(boss.weapon, "Breath of Unholy Fire");
-  boss.strength = 6667;
+  boss.strength = 2500;
   boss.gold = 2000000000;
   boss.exp = 2000000000;
+  boss.maxhp = 6667;
+  boss.hp = 6667;
   strcpy(boss.death, "You finally snuff out the deadly murderous "\
     "dragon's dark flames. You have freed the land of its terror "\
     "filled reign from above!");
@@ -156,27 +163,28 @@ int main(int argc, char *argv[])
 	raw("PROTOCTL NICKv2 VHP");
 	raw("PASS :%s", remotepass);
 	raw("SERVER %s 1 :%s", servername, servername);
-	raw("NICK %S 1 %d %S %s %s %d +wghraAxNt %s :%s v%s", time(NULL), gshost, 
-		servername, time(NULL), gshost, PACKAGE, VERSION);
+	raw("NICK %S 1 %d %S %s %s %d +w%s %s :%s v%s", time(NULL), gshost, 
+		servername, time(NULL), (isBOper() ? "o" : ""), gshost, 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 +w %s %s %s 0 :GameServ", time(NULL), gsident, gshost, 
-		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 +w %s %s %s :GameServ", time(NULL), gsident, gshost,
-		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(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("[] 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
 
@@ -330,13 +338,17 @@ int main(int argc, char *argv[])
 
 
 		if (loaded)
+
+		if (isWelcome())
+		{
+		    #ifdef P10
+			notice(s_GameServ, nick, welcomemsg, realnick);
+		    #else
+			notice(s_GameServ, nick, welcomemsg, nick);
+		    #endif
+		}
 		#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)
+		    unsigned long hv = sHASH((unsigned char *) nick);
 	  	#else
 		    unsigned long hv = iHASH((unsigned char *) nick);
 		#endif
@@ -352,6 +364,21 @@ int main(int argc, char *argv[])
 			strtok(NULL, " ");
 		    strtok(NULL, " ");
 
+		    nickserver = strtok(NULL, " ");
+		    for (int x = 0; x < 32; x++)
+		    {
+			if (stricmp(ignoreservers[x], nickserver) == 0)
+			{
+			    setIgnore(temp);
+			    break;
+			}
+		    }
+		#elif defined(UNREAL)
+		    char *nickserver;
+		    strtok(NULL, " ");
+		    strtok(NULL, " ");
+		    strtok(NULL, " ");
+		    strtok(NULL, " ");
 		    nickserver = strtok(NULL, " ");
 		    for (int x = 0; x < 32; x++)
 		    {
@@ -430,7 +457,7 @@ int main(int argc, char *argv[])
 		delete [] longname;
 		gameserv(source, rest);
 	    }
-	    else if (stricmp(dest, c_Forest) == 0 && listenonc_forest)
+	    else if (stricmp(dest, c_Forest) == 0 && isListenOnCF())
 	    {
 		delete [] longname;
 		forest(source, rest);
@@ -442,7 +469,7 @@ int main(int argc, char *argv[])
 	    rest = strtok(NULL, "");
 	    if (strnicmp(dest, s_GameServ, strlen(s_GameServ)) == 0)
 		gameserv(source, rest);
-	    else if (stricmp(dest, c_Forest) == 0)
+	    else if (stricmp(dest, c_Forest) == 0 && isListenOnCF())
 		forest(source, rest);
       #endif
       #if defined(P10)