X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/2edcd222a4a1aedd142d37b3bb690443eaf2d6f4..5c449fdefc6456ed1f53fb4488755826ac1d5198:/gameserv/tcpclient.cpp

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 0394335..4e939d5 100644
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -35,7 +35,7 @@ using std::cerr;
 using std::endl;
 
 char *PACKAGE = "GameServ";
-char *VERSION = "1.2.3 +devel";
+char *VERSION = "1.2.4 +devel";
 
 int sock;
 long lastrefresh;
@@ -103,12 +103,26 @@ int main(int argc, char *argv[])
         exit(3);
     }
 
-  init_masters();
   load_gs_dbase();
   loadNews(newsdata, todaysnews);
 
+  if (load_masters() == false)
+  {
+	log("Error loading masters");
+	goto end;
+  }
+
   if (load_monsters() == false)
+  {
+	log("Error loading monsters");
+	goto end;
+  }
+
+  if (load_levels() == false)
+  {
+	log("Error loading levels");
 	goto end;
+  }
 
     shuttingdown = false;
 
@@ -122,16 +136,16 @@ int main(int argc, char *argv[])
 	currentserver = strtok(NULL, " ");
     }
 
-  strcpy(boss.name, "Red Dragon");
-  strcpy(boss.weapon, "Breath of Unholy Fire");
+  boss.name = "Red Dragon";
+  boss.weapon = "Breath of Unholy Fire";
   boss.strength = 2500;
   boss.gold = 2000000000;
   boss.exp = 2000000000;
   boss.maxhp = 6667;
   boss.hp = 6667;
-  strcpy(boss.death, "You finally snuff out the deadly murderous "\
+  boss.death = "You finally snuff out the deadly murderous "\
     "dragon's dark flames. You have freed the land of its terror "\
-    "filled reign from above!");
+    "filled reign from above!";
 
 
  // This loop will retry the connection 3 times
@@ -265,12 +279,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!");
 	}
 
 	// Save the player data every updateperiod seconds
@@ -279,8 +297,14 @@ int main(int argc, char *argv[])
 	{
 	    oldTime = currentTime;
 	    log("Saving to %s", playerdata);
+
 	    save_gs_dbase();
 	    saveNews(newsdata, todaysnews);
+	    if (isSavedNotice())
+	    {
+		// Send notice to the channel of the update
+		notice(s_GameServ, c_Forest, "%S player data saved");
+	    }
 	}
 
 
@@ -516,7 +540,7 @@ int main(int argc, char *argv[])
 	    {
 		#ifdef DEBUGMODE
 		    log("Player %s (IRC: %s) joined %s", 
-			joiner->stats->name, 
+			joiner->stats->name.c_str(), 
 			#ifdef P10
 			    joiner->getRealNick(),
 			#else
@@ -570,7 +594,6 @@ int main(int argc, char *argv[])
   saveNews(newsdata, todaysnews);
 
   delete_monsters();
-  delete_masters();
 
   #ifdef DEBUGMODE
       log("<CLOSED>");
@@ -659,7 +682,7 @@ aClient *findIRCplayer(const char *nick)
     if (!is_playing(p))
 	return NULL;
 
-    unsigned long hv = iHASH((unsigned char *) p->stats->name);
+    unsigned long hv = iHASH((unsigned char *) p->stats->name.c_str());
 
     for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
@@ -683,7 +706,7 @@ aClient *findplayer(const char *name)
     for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
 	p = newPtr->getData()->stats;
-	if (stricmp(p->name, name) == 0)
+	if (stricmp(p->name.c_str(), name) == 0)
 	    return newPtr->getData();
 	p = NULL;
     }
@@ -700,6 +723,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 +865,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;