fixed some bugs

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

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 86a0b8446d05bdd8223acbafbfb1bab958556547..14b3d6e67b4af9df0e979039132af5277be59ce7 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -33,7 +33,7 @@
 using namespace std;
 
 char *PACKAGE = "GameServ";
-char *VERSION = "1.3.0 +devel";
+char *VERSION = "1.3.1 +devel";
 
 int sock;
 long lastrefresh;
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
 #ifdef UNREAL
        raw("PASS :%s", remotepass);
        raw("SERVER %s 1 :%s", servername, servername);
-       raw("NICK %S 1 %d %S %s %s %d :%s v%s", time(NULL), gshost, 
+       raw("NICK %S 1 %d %s %s %s %d :%s v%s", time(NULL), gsident, gshost, 
                servername, time(NULL), PACKAGE, VERSION);
        raw(":%S JOIN %s", c_Forest);
        raw(":%S MODE %s +tn", c_Forest);
@@ -306,7 +306,7 @@ int main(int argc, char *argv[])
                rolloverall();
                lastrollover = currentTime;
                save_lastrollover();
-               notice(s_GameServ, c_Forest, "Adding %d forest fights to all players!", forestfights);
+               notice(s_GameServ, c_Forest, "Adding %d forest fights to all players!", numrolloverfights);
              }
          }
 
@@ -569,7 +569,7 @@ int main(int argc, char *argv[])
            {
                #ifdef DEBUGMODE
                    log("Player %s (IRC: %s) joined %s", 
-                       joiner->stats->name.c_str(), 
+                       joiner->stats->getName().c_str(), 
                        #ifdef P10
                            joiner->getRealNick(),
                        #else
@@ -712,7 +712,7 @@ aClient *findIRCplayer(const char *nick)
     if (!is_playing(p))
        return NULL;
 
-    unsigned long hv = iHASH((unsigned char *) p->stats->name.c_str());
+    unsigned long hv = iHASH((unsigned char *) p->stats->getName().c_str());
 
     for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
@@ -730,17 +730,17 @@ aClient *findIRCplayer(const char *nick)
 
 aClient *findplayer(const char *name)
 {
-    ListNode <aClient> *newPtr;
-    Player *p = NULL;
-    unsigned long hv = iHASH((unsigned char *) name);
-    for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
+  ListNode <aClient> *newPtr;
+  Player *p = NULL;
+  unsigned long hv = iHASH((unsigned char *) name);
+  for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
-       p = newPtr->getData()->stats;
-       if (stricmp(p->name.c_str(), name) == 0)
+         p = newPtr->getData()->stats;
+         if (stricmp(p->getName().c_str(), name) == 0)
            return newPtr->getData();
-       p = NULL;
+         p = NULL;
     }
-    return NULL;
+  return NULL;
 }
 
 void check_idles()
@@ -753,7 +753,7 @@ void check_idles()
        for (newPtr = players[x].First(); newPtr; newPtr = newPtr->Next())
        {
            p = newPtr->getData()->stats;
-           switch(p->level)
+           switch(p->getLevel())
            {
                case 1:
                if ((time(NULL) - p->lastlogin) / 86400 >= level1expire)