New autoconf

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

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 54706fc759d635b76da421cd5efeb46e84ea0c9a..1ef3832f989333b761eed7cb1d3dca532ab36108 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -24,7 +24,6 @@
 #include <time.h>
 #include <stdlib.h>
 
-
 int sock;
 List<aClient> clients;
 
@@ -73,7 +72,8 @@ int main(int argc, char *argv[])
 
   printf("Server: %s\n",buffer);
   init_monsters();
-  //load_gs_dbase();
+  init_masters();
+  load_gs_dbase();
   while (connected) {
       if (sock_gets(sock,buffer,sizeof(buffer)) == -1) {
         connected = 0;
@@ -88,12 +88,11 @@ int main(int argc, char *argv[])
        else
            cmd = strtok(buf, " ");
 
-       cout << "Server: " << buffer << endl;
+       cout << "Server: " << buffer << endl << flush;
        if (stricmp(cmd, "PING") == 0) {
-           char *times;
-           times = strtok(NULL, "");
-           printf("input: PONG %s \n", times);
-           raw("PONG %s ", times);
+           char *timestamp;
+           timestamp = strtok(NULL, "");
+           raw("PONG %s", timestamp);
        } else if (strncmp(cmd, "NICK", 4) == 0) {
            if (buffer[0] == ':')
            {
@@ -118,12 +117,14 @@ int main(int argc, char *argv[])
            aClient *quitter;
            if (quitter = find(source + 1))
                clients.remove(quitter);
+           if (quitter = findplayer(source + 1))
+               players.remove(quitter);
 
        } else if (stricmp(cmd, "PRIVMSG") == 0) {
            char *rest, *dest;
            dest = strtok(NULL, " ");
            rest = strtok(NULL, "");
-           if (stricmp(dest, s_GameServ) == 0)
+           if (strnicmp(dest, s_GameServ, strlen(s_GameServ)) == 0)
                gameserv(source, rest);
            else if (stricmp(dest, c_Forest) == 0)
                forest(source, rest);
@@ -137,6 +138,10 @@ int main(int argc, char *argv[])
           //       source << endl;
        }
   }
+  save_gs_dbase();
+  delete_monsters();
+  delete_masters();
+
   printf("<CLOSED>\n");
   close(sock);
   unload_config_file();
@@ -172,6 +177,21 @@ aClient *findbynick(char *nick)
     return client;    
 }
 
+aClient *findplayer(const char *name)
+{
+    ListNode <aClient> *newPtr;
+    Player *p = NULL;
+
+    for (newPtr = players.First(); newPtr; newPtr = newPtr->Next())
+    {
+       p = newPtr->getData()->stats;
+       if (stricmp(p->name, name) == 0)
+           return newPtr->getData();
+       p = NULL;
+    }
+    return NULL;
+}
+
 aClient *findbynick(const char *nick)
 {
     ListNode <aClient> *newPtr;