Added a .cvsignore file, listing what items are to be ignored when using

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

diff --git a/gameserv/config.cpp b/gameserv/config.cpp
index 274b6c4928275325a53ff032c3a30c6427495424..97ae564c49bad7e4c41aa045f7eef95538bde21c 100644 (file)
--- a/gameserv/config.cpp
+++ b/gameserv/config.cpp
@@ -1,8 +1,11 @@
-#include <fstream.h>
+#include <fstream>
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "extern.h"
 
+using std::ifstream;
+
 void load_config_file(char *config);
 void unload_config_file();
 
@@ -16,7 +19,9 @@ char *c_Forest;                       // Forest channel
 char *c_ForestTopic;           // Forest Channel Topic
 char *adminpass;               // Administrator password
 char *welcomemsg;              // Welcome Message
-int confloadtime;              // Welcome Message Delay
+int welcomedelay;              // Welcome Message Delay
+int updateperiod;              // Seconds until another player database update
+int forestfights;              // Forest fights per day
 
 // Remote server stuff. This is used for the outgoing connection gameserv needs to make
 // to a real ircd.
@@ -25,6 +30,11 @@ 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
+
+#if defined(P10)
+       char *gsnum = "[]AAA";          // GameServ Numeric
+#endif
 
 void unload_config_file()
 {
@@ -48,6 +58,8 @@ void unload_config_file()
        delete [] remotepass;
     if (playerdata)
        delete [] playerdata;
+    if (monsterdata)
+       delete [] monsterdata;
     if (adminpass)
        delete [] adminpass;
     if (welcomemsg)
@@ -65,19 +77,27 @@ void load_config_file(char *config)
     infile.open(config);
     if (infile.fail())
     {
-       cout << "Error opening " << config << endl;
+       log("Error opening %s", config);
        return;
     }
 
     while (infile.getline(buf, 1024, '\n'))
     {
-       cout << "Buf: " << buf << endl;
+       #ifdef DEBUGMODE
+           log("Buf: %s", buf);
+       #endif
 
        if (buf[0] == '#' || buf[0] == ' ' || buf[0] == '\0' || buf[0] == '\n' || buf[0] == '\r')
            continue;
        
        directive = strtok(buf, " ");
 
+        if (stricmp(directive, "DIE") == 0)
+       {
+           value = strtok(NULL, "");
+           log("You should read the entire %s file!", config);
+           exit(0);
+       }
        if (stricmp(directive, "S_GAMESERV") == 0)
        {
            value = strtok(NULL, " ");
@@ -138,16 +158,32 @@ 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)
+       else if (stricmp(directive, "WELCOMEDELAY") == 0)
+       {
+           value = strtok(NULL, " ");
+           welcomedelay = stringtoint(value);
+       }
+       else if (stricmp(directive, "FORESTFIGHTS") == 0)
+       {
+           value = strtok(NULL, " ");
+           forestfights = stringtoint(value);
+       }
+       else if (stricmp(directive, "UPDATEPERIOD") == 0)
        {
            value = strtok(NULL, " ");
-           confloadtime = stringtoint(value);
+           updateperiod = stringtoint(value);
        }
        else if (stricmp(directive, "WELCOMEMSG") == 0)
        {
@@ -157,7 +193,9 @@ void load_config_file(char *config)
        }
        else
        {
-           cout << "Unknown Directive. Buffer: " << buf << endl;
+           #ifdef DEBUGMODE
+               log("Unknown Directive. Buffer: %s", buf);
+           #endif
            continue;
        }
     }