fixed a small problem with compiler warnings

[irc/gameservirc.git] / gameserv / tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 4e939d569017f8fbe4153dfb50e9e0e617817f32..2e97580b95c4c4b4e11f1e97026ccb282aa10af6 100644 (file)
--- 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.4 +devel";
+char *VERSION = "1.2.6 +devel";
 
 int sock;
 long lastrefresh;
@@ -102,7 +102,6 @@ int main(int argc, char *argv[])
         perror("Could not turn into a daemon");
         exit(3);
     }
-
   load_gs_dbase();
   loadNews(newsdata, todaysnews);
 
@@ -118,6 +117,12 @@ int main(int argc, char *argv[])
        goto end;
   }
 
+  if (!load_dragon())
+  {
+       log("Error loading dragon");
+       goto end;
+  }
+
   if (load_levels() == false)
   {
        log("Error loading levels");
@@ -136,18 +141,6 @@ int main(int argc, char *argv[])
        currentserver = strtok(NULL, " ");
     }
 
-  boss.name = "Red Dragon";
-  boss.weapon = "Breath of Unholy Fire";
-  boss.strength = 2500;
-  boss.gold = 2000000000;
-  boss.exp = 2000000000;
-  boss.maxhp = 6667;
-  boss.hp = 6667;
-  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++)
  {
@@ -227,6 +220,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. */
@@ -591,6 +590,7 @@ int main(int argc, char *argv[])
   end:
 
   save_gs_dbase();
+  save_dragon();
   saveNews(newsdata, todaysnews);
 
   delete_monsters();