Fixed a bug in check_idles() in tcpclient.cpp causing is_playing(0x0) to be called...

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

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 0394335b24fd910d9af8df81f93ab64de05447a4..4832cad691cac04fe80650a3ea40fdf24bf03a68 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -265,12 +265,16 @@ int main(int argc, char *argv[])
        }
 
        // Refresh players and clear news if the time is up
-       if (loadtime - lastrefresh >= refreshperiod)
+       currentTime = time(NULL);
+       if (currentTime - lastrefresh >= refreshperiod)
        {
            refreshall();
            clearNews(todaysnews);
            saveNews(newsdata, todaysnews);
+           lastrefresh = currentTime;
            save_lastrefresh();
+           notice(s_GameServ, c_Forest, "Refreshing all players "\
+                       "and resetting news! %ld", refreshperiod);
        }
 
        // Save the player data every updateperiod seconds
@@ -700,6 +704,26 @@ void check_idles()
        for (newPtr = players[x].First(); newPtr; newPtr = newPtr->Next())
        {
            p = newPtr->getData()->stats;
+           switch(p->level)
+           {
+               case 1:
+               if ((time(NULL) - p->lastlogin) / 86400 >= level1expire)
+               {
+                   logout(newPtr->getData());
+                   players[x].remove(newPtr->getData());
+                   return;
+               }
+                   break;
+
+               default:
+               if ((time(NULL) - p->lastlogin) / 86400 >= defaultexpire)
+               {
+                   logout(newPtr->getData());
+                   players[x].remove(newPtr->getData());
+                   return;
+               }
+                   break;
+           }
            if (timedOut(p))
            {
                timeOutEvent(p);
@@ -822,10 +846,17 @@ void load_lastrefresh()
        #endif
 
        generate:
+       long mytime = time(NULL);
        #ifdef DEBUGMODE
            log("Generating new refresh time");
        #endif
-       lastrefresh = time(NULL);
+
+       // Just a safety measure... tho no one should
+       // get anywhere near the time as their refreshperiod
+       if (refreshperiod >= mytime)
+           refreshperiod = 86400;
+
+       lastrefresh = mytime - (mytime % refreshperiod);
        refreshall();
        save_lastrefresh();
        return;