X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/4bcfa8639332e9d6ce7fe34c70385575a5bd90a3..5431156e15bed660986dd7ff32f18680c25dd95f:/gameserv/config.cpp

diff --git a/gameserv/config.cpp b/gameserv/config.cpp
index 7672c76..ec3605e 100644
--- a/gameserv/config.cpp
+++ b/gameserv/config.cpp
@@ -23,6 +23,9 @@ char *c_ForestTopic; 		// Forest Channel Topic
 char *adminpass;		// Administrator password
 char *welcomemsg;		// Welcome Message
 char *ignoreserverslist;	// Servernames to ignore
+char *nsname;			// NickServ's name
+char *nspass;			// GameServ's NickServ Password
+
 int welcomedelay;		// Welcome Message Delay
 int updateperiod;		// Seconds until another player database update
 int forestfights;		// Forest fights per day
@@ -30,6 +33,8 @@ int maxafightdistance;		// Max levels above a player they can fight player->play
 int maxbfightdistance;		// Max levels below a player they can fight player->player
 int maxidletime;		// Max time (in seconds) a player can be idle for
 int idlecheckperiod;		// Period for checking every player's idle time
+int level1expire;		// Days for level 1 players to expire
+int defaultexpire;		// Days for other levels to expire
 long refreshperiod;		// Period for refreshing players
 long configflags;		// Holds the bit representation of some boolean values
 
@@ -40,7 +45,6 @@ char *remoteport;		// Port to connect to on remoteserver
 char *remotepass;		// Password for the server link
 
 char *playerdata; 		// File to store player data in
-char *monsterdata;		// File to load monster data from
 char *newsdata;			// File to store news data in
 char *pidfile;			// Process ID file
 
@@ -70,8 +74,6 @@ void unload_config_file()
 	delete [] remotepass;
     if (playerdata)
 	delete [] playerdata;
-    if (monsterdata)
-	delete [] monsterdata;
     if (adminpass)
 	delete [] adminpass;
     if (welcomemsg)
@@ -82,6 +84,10 @@ void unload_config_file()
 	delete [] ignoreserverslist;
     if (newsdata)
 	delete [] newsdata;
+    if (nsname)
+	delete [] nsname;
+    if (nspass)
+	delete [] nspass;
 
     configflags = 0;
 }
@@ -90,7 +96,7 @@ int load_config_file(char *config)
 {
     char *buf, *directive, *value;
 
-    #define numdirectives 23
+    #define numdirectives 28
 
     unload_config_file();
 
@@ -111,7 +117,8 @@ int load_config_file(char *config)
      directives[7].desc = "REMOTEPORT - Port on the remote server to connect to";
      directives[8].desc = "REMOTEPASS - Password on the remote server";
      directives[9].desc = "PLAYERDATA - File to store the player saves in";
-    directives[10].desc = "MONSTERDATA - File to load the monsters from";
+    directives[10].desc = "SAVEDNOTICE - True/False as to wether or not to tell the forest "\
+				"channel that the player database has been saved";
     directives[11].desc = "ADMINPASS - Password to identify as an admin with";
     directives[12].desc = "WELCOMEDELAY - Delay (in seconds) to wait before welcoming new users to the network";
     directives[13].desc = "FORESTFIGHTS - Number of forest fights players get every day";
@@ -132,6 +139,16 @@ int load_config_file(char *config)
     directives[21].desc = "NEWSDATA - File to store daily news in";
     directives[22].desc = "REFRESHPERIOD - Period (in seconds) to "\
 			  	"refresh players";
+    directives[23].desc = "LEVEL1EXPIRE - Amount of days until a "\
+			"level 1 player's account is deleted due to "\
+			"inactivity.";
+    directives[24].desc = "DEFAULTEXPIRE - Amount of days until a "\
+			"level 2 and above player's account is "\
+			"deleted due to inactivity";
+    directives[25].desc = "USENICKSERV - True/False as to wether or not "\
+			"GameServ should identify with NickServ";
+    directives[26].desc = "NSNAME - Your network's NickServ nickname";
+    directives[27].desc = "NSPASS - GameServ's NickServ Password";
 
     configflags = 0;
 
@@ -241,11 +258,11 @@ int load_config_file(char *config)
 	    strcpy(playerdata, value);
 	    directives[9].done = true;
 	}
-	else if (stricmp(directive, "MONSTERDATA") == 0)
+	else if (stricmp(directive, "SAVEDNOTICE") == 0)
 	{
 	    value = strtok(NULL, "");
-	    monsterdata = new char[strlen(value) + 1];
-	    strcpy(monsterdata, value);
+	    if (stricmp(value, "TRUE") == 0)
+		setSavedNotice();
 	    directives[10].done = true;
 	}
 	else if (stricmp(directive, "ADMINPASS") == 0)
@@ -325,6 +342,42 @@ int load_config_file(char *config)
 	    refreshperiod = stringtoint(value);
 	    directives[22].done = true;
 	}
+	else if (stricmp(directive, "LEVEL1EXPIRE") == 0)
+	{
+	    value = strtok(NULL, " ");
+	    level1expire = stringtoint(value);
+	    directives[23].done = true;
+	}
+	else if (stricmp(directive, "DEFAULTEXPIRE") == 0)
+	{
+	    value = strtok(NULL, " ");
+	    defaultexpire = stringtoint(value);
+	    directives[24].done = true;
+	}
+	else if (stricmp(directive, "USENICKSERV") == 0)
+	{
+	    value = strtok(NULL, " ");
+	    if (stricmp(value, "TRUE") == 0)
+	    {
+		setUseNickServ();
+	    }
+
+	    directives[25].done = true;
+	}
+	else if (stricmp(directive, "NSNAME") == 0)
+	{
+	    value = strtok(NULL, "");
+	    nsname = new char[strlen(value) + 1];
+	    strcpy(nsname, value);
+	    directives[26].done = true;
+	}
+	else if (stricmp(directive, "NSPASS") == 0)
+	{
+	    value = strtok(NULL, "");
+	    nspass = new char[strlen(value) + 1];
+	    strcpy(nspass, value);
+	    directives[27].done = true;
+	}
 	else if (stricmp(directive, "WELCOMEMSG") == 0)
 	{
 	    // This directive is optional