X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/6f727d4c9eb5c886f14598577f40da583577444e..7cc338f616a11e910933a1d2206d8a0811544195:/gameserv/tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 7fb0376..7230650 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.3 +devel";
 
 int sock;
 int day;
@@ -57,13 +55,15 @@ void closeall(int fd);
 
 int main(int argc, char *argv[])
 {
-  char buffer[1024], buf[1024];
-  memset(buffer, 0, 1024);
-  memset(buf, 0, 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
@@ -79,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();
@@ -93,14 +93,20 @@ int main(int argc, char *argv[])
   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(3);
     }
+
   init_masters();
   load_gs_dbase();
+  cout << "Loading news" << endl;
+  loadNews(newsdata, todaysnews);
 
   if (load_monsters() == false)
 	goto end;
@@ -119,9 +125,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!");
@@ -174,12 +182,20 @@ int main(int argc, char *argv[])
 	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(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 %s DAqAoB %s :%S", time(NULL), gsident, gshost,
-		(isBOper() ? "+o" : "") gsnum);
+		(isBOper() ? "+o" : ""), gsnum);
 	raw("[] B %s %d +tn %s:o", c_Forest, time(NULL) - 864000, gsnum);
 #endif
 
@@ -187,9 +203,14 @@ int main(int argc, char *argv[])
 	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);
-#endif
+    #ifndef HYBRID
+	#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
+    #endif
 	raw(":%S TOPIC %s :%s", c_Forest, c_ForestTopic);
 #endif
 
@@ -251,6 +272,7 @@ int main(int argc, char *argv[])
 	    oldTime = currentTime;
 	    log("Saving to %s", playerdata);
 	    save_gs_dbase();
+	    saveNews(newsdata, todaysnews);
 	}
 
 
@@ -333,20 +355,24 @@ 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
 
 		temp = clients[hv].insertAtBack(newuser);
 
-		#if defined(HYBRID) || defined(BAHAMUT)
+		#if defined(HYBRID) || defined(BAHAMUT) || defined(ULTIMATE2)
 		    char *nickserver;
 		    strtok(NULL, " ");
 		    strtok(NULL, " ");
@@ -354,7 +380,21 @@ int main(int argc, char *argv[])
 		    if (nickserver[0] == '+')
 			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++)
 		    {
@@ -445,7 +485,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)
@@ -519,6 +559,7 @@ int main(int argc, char *argv[])
   end:
 
   save_gs_dbase();
+  saveNews(newsdata, todaysnews);
   save_day();
 
   delete_monsters();