X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/10e38380e2eebefe74a51a2655db96d6e3b9eeb8..169c286a23bcef717a3034d0ab5693b92b6e68c9:/gameserv/tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index fad1b2a..fa73761 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.3 +devel";
+char *VERSION = "1.2.5 +devel";
 
 int sock;
 long lastrefresh;
@@ -102,13 +102,26 @@ int main(int argc, char *argv[])
         perror("Could not turn into a daemon");
         exit(3);
     }
-
-  init_masters();
   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_levels() == false)
+  {
+	log("Error loading levels");
 	goto end;
+  }
 
     shuttingdown = false;
 
@@ -122,18 +135,6 @@ int main(int argc, char *argv[])
 	currentserver = strtok(NULL, " ");
     }
 
-  strcpy(boss.name, "Red Dragon");
-  strcpy(boss.weapon, "Breath of Unholy Fire");
-  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!");
-
-
  // This loop will retry the connection 3 times
  for (int retry = 0; retry < 3 && !shuttingdown; retry++)
  {
@@ -213,6 +214,12 @@ int main(int argc, char *argv[])
 	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. */
@@ -274,7 +281,7 @@ int main(int argc, char *argv[])
 	    lastrefresh = currentTime;
 	    save_lastrefresh();
 	    notice(s_GameServ, c_Forest, "Refreshing all players "\
-			"and resetting news! %ld", refreshperiod);
+			"and resetting news!");
 	}
 
 	// Save the player data every updateperiod seconds
@@ -286,8 +293,11 @@ int main(int argc, char *argv[])
 
 	    save_gs_dbase();
 	    saveNews(newsdata, todaysnews);
-	    // Send notice to the channel of the update
-	    notice(s_GameServ, c_Forest, "%S player data saved");
+	    if (isSavedNotice())
+	    {
+		// Send notice to the channel of the update
+		notice(s_GameServ, c_Forest, "%S player data saved");
+	    }
 	}
 
 
@@ -523,7 +533,7 @@ int main(int argc, char *argv[])
 	    {
 		#ifdef DEBUGMODE
 		    log("Player %s (IRC: %s) joined %s", 
-			joiner->stats->name, 
+			joiner->stats->name.c_str(), 
 			#ifdef P10
 			    joiner->getRealNick(),
 			#else
@@ -577,7 +587,6 @@ int main(int argc, char *argv[])
   saveNews(newsdata, todaysnews);
 
   delete_monsters();
-  delete_masters();
 
   #ifdef DEBUGMODE
       log("<CLOSED>");
@@ -666,7 +675,7 @@ aClient *findIRCplayer(const char *nick)
     if (!is_playing(p))
 	return NULL;
 
-    unsigned long hv = iHASH((unsigned char *) p->stats->name);
+    unsigned long hv = iHASH((unsigned char *) p->stats->name.c_str());
 
     for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
@@ -690,7 +699,7 @@ aClient *findplayer(const char *name)
     for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
 	p = newPtr->getData()->stats;
-	if (stricmp(p->name, name) == 0)
+	if (stricmp(p->name.c_str(), name) == 0)
 	    return newPtr->getData();
 	p = NULL;
     }