Updated monsters a bit and changed the last armor

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

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 059907adef6d412975d62d5501892b1b0053dafc..6267e7960d919a1256e4ff240341e08ccbb218c6 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 char *PACKAGE = "GameServ";
-char *VERSION = "1.1.2";
+char *VERSION = "1.1.7";
 
 int sock;
 long timestamp;
@@ -89,13 +89,17 @@ int main(int argc, char *argv[])
 
 
   printf("Server: %s\n",buffer);
-  init_monsters();
   init_masters();
   load_gs_dbase();
   load_timestamp();
-  int loadtime = time(NULL);
+  long int loadtime = time(NULL);
+  long int currentTime;
+  long int oldTime = loadtime;
   bool loaded = false;
 
+  if (load_monsters() == false)
+       goto end;
+
   while (connected) {
       if (sock_gets(sock,buffer,sizeof(buffer)) == -1) {
         connected = 0;
@@ -112,17 +116,30 @@ 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) >= welcomedelay + loadtime)
                loaded = true;
        }
 
+       // Save the player data every updateperiod seconds
+       currentTime = time(NULL);
+       if (currentTime - oldTime >= updateperiod)
+       {
+           oldTime = currentTime;
+           save_gs_dbase();
+       }
+
        if (stricmp(cmd, "PING") == 0) {
            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 +158,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;
@@ -150,8 +167,11 @@ int main(int argc, char *argv[])
            aClient *quitter;
            if ((quitter = find(source + 1)))
                clients.remove(quitter);
-           if ((quitter = findplayer(source + 1)))
-               quitter->setNick("NULL");
+           if ((quitter = findIRCplayer(source + 1)))
+           {
+               quitter->setNick("!NULL!");
+               quitter->stats->user = NULL; // Unidentify them
+           }
 
        } else if (stricmp(cmd, "PRIVMSG") == 0) {
            char *rest, *dest;
@@ -185,8 +205,12 @@ int main(int argc, char *argv[])
           //       source << endl;
        }
   }
+
+  end:
+
   save_gs_dbase();
   save_timestamp();
+
   delete_monsters();
   delete_masters();
 
@@ -225,6 +249,20 @@ aClient *findbynick(char *nick)
     return client;    
 }
 
+aClient *findIRCplayer(const char *nick)
+{
+    ListNode <aClient> *newPtr;
+    aClient *p = NULL;
+
+    for (newPtr = players.First(); newPtr; newPtr = newPtr->Next())
+    {
+       p = newPtr->getData();
+       if (stricmp(p->getNick(), nick) == 0)
+           return p;
+       p = NULL;
+    }
+    return NULL;
+}
 aClient *findplayer(const char *name)
 {
     ListNode <aClient> *newPtr;