Switched the hybrid contrib files to an updated version for configscript. Thank you...

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

diff --git a/gameserv/config.cpp b/gameserv/config.cpp
index fcc004c00e935be55b95951f1eb6f764e8b8408b..abdb4d2423e6543ca7ac9986c279e711c60b3c20 100644 (file)
--- a/gameserv/config.cpp
+++ b/gameserv/config.cpp
@@ -5,8 +5,6 @@
 
 void load_config_file(char *config);
 void unload_config_file();
-int stricmp(const char *s1, const char *s2);
-int strnicmp(const char *s1, const char *s2, size_t len);
 
 /* Random Configuration Stuff Goes Here until I code it to load from a .conf file :)*/
 
@@ -17,7 +15,8 @@ char *servername;             // GameServ's Server
 char *c_Forest;                        // Forest channel
 char *c_ForestTopic;           // Forest Channel Topic
 char *adminpass;               // Administrator password
-
+char *welcomemsg;              // Welcome Message
+int confloadtime;              // Welcome Message Delay
 
 // Remote server stuff. This is used for the outgoing connection gameserv needs to make
 // to a real ircd.
@@ -26,6 +25,7 @@ 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
 
 void unload_config_file()
 {
@@ -49,9 +49,14 @@ void unload_config_file()
        delete [] remotepass;
     if (playerdata)
        delete [] playerdata;
+    if (monsterdata)
+       delete [] monsterdata;
     if (adminpass)
        delete [] adminpass;
+    if (welcomemsg)
+       delete [] welcomemsg;
 }
+
 void load_config_file(char *config)
 {
     char *buf, *directive, *value;
@@ -63,7 +68,7 @@ void load_config_file(char *config)
     infile.open(config);
     if (infile.fail())
     {
-       cerr << "Error opening " << config << endl;
+       cout << "Error opening " << config << endl;
        return;
     }
 
@@ -71,7 +76,7 @@ void load_config_file(char *config)
     {
        cout << "Buf: " << buf << endl;
 
-       if (buf[0] == '#' || buf[0] == ' ' || buf[0] == '\0')
+       if (buf[0] == '#' || buf[0] == ' ' || buf[0] == '\0' || buf[0] == '\n' || buf[0] == '\r')
            continue;
        
        directive = strtok(buf, " ");
@@ -136,18 +141,34 @@ void load_config_file(char *config)
            playerdata = new char[strlen(value) + 1];
            strcpy(playerdata, value);
        }
+       else if (stricmp(directive, "MONSTERDATA") == 0)
+       {
+           value = strtok(NULL, "");
+           monsterdata = new char[strlen(value) + 1];
+           strcpy(monsterdata, value);
+       }
        else if (stricmp(directive, "ADMINPASS") == 0)
        {
            value = strtok(NULL, "");
            adminpass = new char[strlen(value) + 1];
            strcpy(adminpass, value);
        }
+       else if (stricmp(directive, "CONFLOADTIME") == 0)
+       {
+           value = strtok(NULL, " ");
+           confloadtime = stringtoint(value);
+       }
+       else if (stricmp(directive, "WELCOMEMSG") == 0)
+       {
+           value = strtok(NULL, "");
+           welcomemsg = new char[strlen(value) + 1];
+           strcpy(welcomemsg, value);
+       }
        else
        {
-           cerr << "Unknown Directive. Buffer: " << buf << endl;
+           cout << "Unknown Directive. Buffer: " << buf << endl;
            continue;
        }
-       //infile.ignore(1);
     }
 delete [] buf;
 infile.close();