New functionality. Loading monsters from a file is finished. Monsters still need...

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

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 059907adef6d412975d62d5501892b1b0053dafc..998ab431f63582299a40fec763ecf5ad5a1101f7 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -89,13 +89,15 @@ int main(int argc, char *argv[])
 
 
   printf("Server: %s\n",buffer);
-  init_monsters();
   init_masters();
   load_gs_dbase();
   load_timestamp();
   int loadtime = time(NULL);
   bool loaded = false;
 
+  if (load_monsters() == false)
+       goto end;
+
   while (connected) {
       if (sock_gets(sock,buffer,sizeof(buffer)) == -1) {
         connected = 0;
@@ -112,10 +114,10 @@ int main(int argc, char *argv[])
 
        cout << "Server: " << buffer << endl << flush;
 
-       // Wait five seconds then we're loaded.
+       // Wait N seconds then we're loaded.
         if (!loaded)
        {
-           if (time(NULL) >= 5 + loadtime)
+           if (time(NULL) >= confloadtime + loadtime)
                loaded = true;
        }
 
@@ -123,6 +125,11 @@ int main(int argc, char *argv[])
            char *timestamp;
            timestamp = strtok(NULL, "");
            raw("PONG %s", timestamp);
+       } else if (stricmp(cmd, "VERSION") == 0) {
+           char *server;
+           server = strtok(NULL, " ");
+           server++;
+           raw(":%s 351 %s  %s %s. %s", servername, source+1, PACKAGE, VERSION, servername);
        } else if (strncmp(cmd, "NICK", 4) == 0) {
            if (buffer[0] == ':')
            {
@@ -141,7 +148,7 @@ int main(int argc, char *argv[])
                nick = strtok(NULL, " ");
                newuser = new aClient(nick);
                if (loaded)
-                   notice(s_GameServ, nick, "Hello, %s! This network utilizes a services package called GameServ. For info on how to play the game, type /msg %S help.");
+                   notice(s_GameServ, nick, welcomemsg, nick);
 
                clients.insertAtBack(newuser);
                delete newuser;
@@ -185,8 +192,12 @@ int main(int argc, char *argv[])
           //       source << endl;
        }
   }
+
+  end:
+
   save_gs_dbase();
   save_timestamp();
+
   delete_monsters();
   delete_masters();