diff options
| author | Kenpachi2k13 <3476227+Kenpachi2k13@users.noreply.github.com> | 2020-05-05 01:00:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 01:00:27 +0200 |
| commit | 66607bfbfe197a5fec86dd1efe34a2da80929648 (patch) | |
| tree | ed0e97ddc134c82067a436ea3ffd67f2f46be60b /src/config | |
| parent | 3f6b7497531f9ace331ca74d271898e938245c04 (diff) | |
| parent | 944d8489f1bcca93e6b2ff06a159084f064dce12 (diff) | |
| download | hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.tar.gz hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.tar.bz2 hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.tar.xz hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.zip | |
Merge branch 'master' into configure_newopt
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/classes/general.h | 4 | ||||
| -rw-r--r-- | src/config/const.h | 11 | ||||
| -rw-r--r-- | src/config/core.h | 4 | ||||
| -rw-r--r-- | src/config/renewal.h | 4 | ||||
| -rw-r--r-- | src/config/secure.h | 4 |
5 files changed, 15 insertions, 12 deletions
diff --git a/src/config/classes/general.h b/src/config/classes/general.h index ad42fefb4..d1a8b0a16 100644 --- a/src/config/classes/general.h +++ b/src/config/classes/general.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/const.h b/src/config/const.h index 4767b5721..45e98e3f8 100644 --- a/src/config/const.h +++ b/src/config/const.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,10 +49,13 @@ /** * Path within the /db folder to (non-)renewal specific db files **/ +#define DBPATH_RE "re/" +#define DBPATH_PRE "pre-re/" + #ifdef RENEWAL - #define DBPATH "re/" + #define DBPATH DBPATH_RE #else - #define DBPATH "pre-re/" + #define DBPATH DBPATH_PRE #endif /** diff --git a/src/config/core.h b/src/config/core.h index a22d47324..b091e6dee 100644 --- a/src/config/core.h +++ b/src/config/core.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/renewal.h b/src/config/renewal.h index 6c45abc0e..3163a4134 100644 --- a/src/config/renewal.h +++ b/src/config/renewal.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/secure.h b/src/config/secure.h index f262852e4..fd05b4a49 100644 --- a/src/config/secure.h +++ b/src/config/secure.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |