X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/e3ede4a7b12fd781e2ea8f7a97adb7806629d59f..7df8f13679b674515640f895ea3acc50e9193164:/gameserv/tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index b54dba7..6662560 100644
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -35,7 +35,7 @@ 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;
@@ -122,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!");
@@ -182,7 +184,7 @@ int main(int argc, char *argv[])
 	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
 
@@ -336,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
@@ -358,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++)
 		    {
@@ -448,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)