From f5016e755dcde5a47d28a2d3fd26b76ab47cb33d Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Thu, 27 Oct 2005 18:12:29 +0000
Subject: [PATCH] Define macroses GOLDAREA_INC, GOLDED_MSG, GOLDHELP_CFG,
 GOLDKEYS_CFG, GOLDLANG_CFG, GOLDLAST_LST, GOLDUSER_LST, GOLDED_CFM, GOLDXLAT,
 GOLDED_LOG,NAMES_FD, GOLDED_LST, FIDOLASTREAD

---
 golded3/gccfgg.cpp | 22 +++++++++++-----------
 golded3/gefn.h     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 golded3/geinit.cpp |  2 +-
 3 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp
index d88dd1f..0d0e11b 100644
--- a/golded3/gccfgg.cpp
+++ b/golded3/gccfgg.cpp
@@ -552,18 +552,18 @@ CfgGed::CfgGed() {
 
   // pathes
   strcpy(goldcfg, GEDCFG);
-  strcpy(helpcfg.fn, "goldhelp.cfg"); helpcfg.ft = 0;
+  strcpy(helpcfg.fn, GOLDHELP_CFG); helpcfg.ft = 0;
   replaceextension(helpged, helpcfg.fn, __gver_cfgext__);
-  strcpy(keyscfg, "goldkeys.cfg");
-  strcpy(langcfg, "goldlang.cfg");
-  strcpy(goldlast, "goldlast.lst");
-  strcpy(golduser, "golduser.lst");
-  strcpy(confirmfile, "golded.cfm");
-  strxmerge(xlatged, sizeof(xlatged), "goldxlat", __gver_cfgext__, NULL);
-  strcpy(fidolastread, "lastread");
-  strcpy(logfile, "golded.log");
-  strcpy(namesfile, "names.fd");
-  strcpy(userlistfile, "golded.lst");
+  strcpy(keyscfg, GOLDKEYS_CFG);
+  strcpy(langcfg, GOLDLANG_CFG);
+  strcpy(goldlast, GOLDLAST_LST);
+  strcpy(golduser, GOLDUSER_LST);
+  strcpy(confirmfile, GOLDED_CFM);
+  strxmerge(xlatged, sizeof(xlatged), GOLDXLAT, __gver_cfgext__, NULL);
+  strcpy(fidolastread, FIDOLASTREAD);
+  strcpy(logfile, GOLDED_LOG);
+  strcpy(namesfile, NAMES_FD);
+  strcpy(userlistfile, GOLDED_LST);
   *adeptxbbspath = 0;
   *areapath = 0;
   *attachpath = 0;
diff --git a/golded3/gefn.h b/golded3/gefn.h
index 571bbbf..9ac0d79 100644
--- a/golded3/gefn.h
+++ b/golded3/gefn.h
@@ -52,4 +52,48 @@
 #define GOLDED_MSG "golded.msg"
 #endif
 
+#ifndef GOLDHELP_CFG
+#define GOLDHELP_CFG "goldhelp.cfg"
+#endif
+
+#ifndef GOLDKEYS_CFG
+#define GOLDKEYS_CFG "goldkeys.cfg"
+#endif
+
+#ifndef GOLDLANG_CFG
+#define GOLDLANG_CFG "goldlang.cfg"
+#endif
+
+#ifndef GOLDLAST_LST
+#define GOLDLAST_LST "goldlast.lst"
+#endif
+
+#ifndef GOLDUSER_LST
+#define GOLDUSER_LST "golduser.lst"
+#endif
+
+#ifndef GOLDED_CFM
+#define GOLDED_CFM "golded.cfm"
+#endif
+
+#ifndef GOLDXLAT
+#define GOLDXLAT "goldxlat"
+#endif
+
+#ifndef GOLDED_LOG
+#define GOLDED_LOG "golded.log"
+#endif
+
+#ifndef NAMES_FD
+#define NAMES_FD "names.fd"
+#endif
+
+#ifndef GOLDED_LST
+#define GOLDED_LST "golded.lst"
+#endif
+
+#ifndef FIDOLASTREAD
+#define FIDOLASTREAD "lastread"
+#endif
+
 #endif /* __GEFN_H__ */
diff --git a/golded3/geinit.cpp b/golded3/geinit.cpp
index 970331f..351f064 100644
--- a/golded3/geinit.cpp
+++ b/golded3/geinit.cpp
@@ -837,7 +837,7 @@ void Initialize(int argc, char* argv[]) {
   if(CFG->cmdkey.empty()) {
     LOG.ErrConfig();
     LOG.printf("! There do not seem to be any command keys defined.");
-    LOG.printf("+ Advice: Check your key setup in goldkeys.cfg.");
+    LOG.printf("+ Advice: Check your key setup in " GOLDKEYS_CFG );
     ConfigErrorExit();
   }