diff options
| -rw-r--r-- | src/map/Makefile.in | 4 | ||||
| -rw-r--r-- | src/map/config/classes/general.h (renamed from src/map/config/Skills/General.h) | 49 | ||||
| -rw-r--r-- | src/map/config/classes/swordsman.h (renamed from src/map/config/Skills/Swordsman_Classes.h) | 32 | ||||
| -rw-r--r-- | src/map/config/const.h (renamed from src/map/config/Data/Const.h) | 144 | ||||
| -rw-r--r-- | src/map/config/core.h (renamed from src/map/config/Core.h) | 9 | ||||
| -rw-r--r-- | src/map/config/renewal.h (renamed from src/map/config/Renewal.h) | 0 | ||||
| -rw-r--r-- | src/map/config/secure.h (renamed from src/map/config/Secure.h) | 0 | ||||
| -rw-r--r-- | vcproj-10/map-server_sql.vcxproj | 13 | ||||
| -rw-r--r-- | vcproj-10/map-server_sql.vcxproj.filters | 13 | ||||
| -rw-r--r-- | vcproj-9/map-server_sql.vcproj | 16 |
10 files changed, 137 insertions, 143 deletions
diff --git a/src/map/Makefile.in b/src/map/Makefile.in index 2821b7985..0b5ba023d 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -40,8 +40,8 @@ MAP_H = map.h chrif.h clif.h pc.h status.h npc.h \ intif.h trade.h party.h vending.h guild.h pet.h \ log.h mail.h date.h unit.h homunculus.h mercenary.h quest.h instance.h mapreg.h \ buyingstore.h searchstore.h duel.h pc_groups.h \ - config/Core.h config/Renewal.h config/Secure.h config/Data/Const.h \ - config/Skills/General.h config/Skills/Swordsman_Classes.h + config/core.h config/renewal.h config/secure.h config/const.h \ + config/classes/general.h config/classes/swordsman.h HAVE_MYSQL=@HAVE_MYSQL@ ifeq ($(HAVE_MYSQL),yes) diff --git a/src/map/config/Skills/General.h b/src/map/config/classes/general.h index 746630845..279bb033e 100644 --- a/src/map/config/Skills/General.h +++ b/src/map/config/classes/general.h @@ -1,25 +1,24 @@ -// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder -#ifndef _CONFIG_GENERAL_H_ -#define _CONFIG_GENERAL_H_ - -/** - * rAthena configuration file (http://rathena.org) - * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/ - **/ - -/** - * Default Magical Reflection Behavior - * - When reflecting, reflected damage depends on gears caster is wearing, not target - * - When disabled damage depends on gears target is wearing, not caster. - * @values 1 (enabled) or 0 (disabled) - **/ -#define MAGIC_REFLECTION_TYPE 1 - -/** - * No settings past this point - **/ -#include "Mage_Classes.h" -#include "Swordsman_Classes.h" - -#endif // _CONFIG_GENERAL_H_ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_GENERAL_H_
+#define _CONFIG_GENERAL_H_
+
+/**
+ * rAthena configuration file (http://rathena.org)
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ **/
+
+/**
+ * Default Magical Reflection Behavior
+ * - When reflecting, reflected damage depends on gears caster is wearing, not target
+ * - When disabled damage depends on gears target is wearing, not caster.
+ * @values 1 (enabled) or 0 (disabled)
+ **/
+#define MAGIC_REFLECTION_TYPE 1
+
+/**
+ * No settings past this point
+ **/
+#include "swordsman.h"
+
+#endif // _CONFIG_GENERAL_H_
diff --git a/src/map/config/Skills/Swordsman_Classes.h b/src/map/config/classes/swordsman.h index 44ae922d5..3c8f69043 100644 --- a/src/map/config/Skills/Swordsman_Classes.h +++ b/src/map/config/classes/swordsman.h @@ -1,16 +1,16 @@ -// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder -#ifndef _CONFIG_SKILLS_SWORDS_H_ -#define _CONFIG_SKILLS_SWORDS_H_ -/** - * rAthena configuration file (http://rathena.org) - * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/ - **/ - -/// rune knight -/// -/// maximum number of runes that a rune knight character can carry at any given time -/// default: 20 -#define MAX_RUNE 20 - -#endif // _CONFIG_SKILLS_SWORDS_H_ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _CONFIG_SKILLS_SWORDS_H_
+#define _CONFIG_SKILLS_SWORDS_H_
+/**
+ * rAthena configuration file (http://rathena.org)
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ **/
+
+/// rune knight
+///
+/// maximum number of runes that a rune knight character can carry at any given time
+/// default: 20
+#define MAX_RUNE 20
+
+#endif // _CONFIG_SKILLS_SWORDS_H_
diff --git a/src/map/config/Data/Const.h b/src/map/config/const.h index 8b9980252..dc85bda82 100644 --- a/src/map/config/Data/Const.h +++ b/src/map/config/const.h @@ -1,72 +1,72 @@ -// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder -#ifndef _RRCONFIGS_CONST_ -#define _RRCONFIGS_CONST_ - -/** - * rAthena configuration file (http://rathena.org) - * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/ - **/ - -/** - * @INFO: This file holds constants that aims at making code smoother and more efficient - */ - -/** - * "Constants" - **/ -#ifdef RENEWAL_CAST - - #ifndef RENEWAL - #error RENEWAL_CAST requires RENEWAL enabled - #endif - - #define CONST_CASTRATE_SCALE RENEWAL_CAST_VMIN - /** - * Cast Rate Formula: (DEX x 2)+INT - **/ - #define CONST_CASTRATE_CALC ((status_get_dex(bl)*2)+status_get_int(bl)) -#else - #define CONST_CASTRATE_SCALE battle_config.castrate_dex_scale - /** - * Cast Rate Formula: (DEX) - **/ - #define CONST_CASTRATE_CALC (status_get_dex(bl)) -#endif - -/** - * "Sane Checks" to save you from compiling with cool bugs - **/ -#if SECURE_NPCTIMEOUT_INTERVAL <= 0 - #error SECURE_NPCTIMEOUT_INTERVAL should be at least 1 (1s) -#endif -#if SECURE_NPCTIMEOUT < 0 - #error SECURE_NPCTIMEOUT cannot be lower than 0 -#endif - -/** - * Path within the /db folder to (non-)renewal specific db files - **/ -#ifdef RENEWAL - #define DBPATH "re/" -#else - #define DBPATH "pre-re/" -#endif - -/** - * DefType - **/ -#ifdef RENEWAL - typedef short defType; - #define DEFTYPE_MIN SHRT_MIN - #define DEFTYPE_MAX SHRT_MAX -#else - typedef signed char defType; - #define DEFTYPE_MIN CHAR_MIN - #define DEFTYPE_MAX CHAR_MAX -#endif - -/** - * End of File - **/ -#endif +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+#ifndef _RRCONFIGS_CONST_
+#define _RRCONFIGS_CONST_
+
+/**
+ * rAthena configuration file (http://rathena.org)
+ * For detailed guidance on these check http://rathena.org/wiki/SRC/map/config/
+ **/
+
+/**
+ * @INFO: This file holds constants that aims at making code smoother and more efficient
+ */
+
+/**
+ * "Constants"
+ **/
+#ifdef RENEWAL_CAST
+
+ #ifndef RENEWAL
+ #error RENEWAL_CAST requires RENEWAL enabled
+ #endif
+
+ #define CONST_CASTRATE_SCALE RENEWAL_CAST_VMIN
+ /**
+ * Cast Rate Formula: (DEX x 2)+INT
+ **/
+ #define CONST_CASTRATE_CALC ((status_get_dex(bl)*2)+status_get_int(bl))
+#else
+ #define CONST_CASTRATE_SCALE battle_config.castrate_dex_scale
+ /**
+ * Cast Rate Formula: (DEX)
+ **/
+ #define CONST_CASTRATE_CALC (status_get_dex(bl))
+#endif
+
+/**
+ * "Sane Checks" to save you from compiling with cool bugs
+ **/
+#if SECURE_NPCTIMEOUT_INTERVAL <= 0
+ #error SECURE_NPCTIMEOUT_INTERVAL should be at least 1 (1s)
+#endif
+#if SECURE_NPCTIMEOUT < 0
+ #error SECURE_NPCTIMEOUT cannot be lower than 0
+#endif
+
+/**
+ * Path within the /db folder to (non-)renewal specific db files
+ **/
+#ifdef RENEWAL
+ #define DBPATH "re/"
+#else
+ #define DBPATH "pre-re/"
+#endif
+
+/**
+ * DefType
+ **/
+#ifdef RENEWAL
+ typedef short defType;
+ #define DEFTYPE_MIN SHRT_MIN
+ #define DEFTYPE_MAX SHRT_MAX
+#else
+ typedef signed char defType;
+ #define DEFTYPE_MIN CHAR_MIN
+ #define DEFTYPE_MAX CHAR_MAX
+#endif
+
+/**
+ * End of File
+ **/
+#endif
diff --git a/src/map/config/Core.h b/src/map/config/core.h index 95c3ee8ed..4d8e38f95 100644 --- a/src/map/config/Core.h +++ b/src/map/config/core.h @@ -28,12 +28,13 @@ /** * No settings past this point **/ -#include "./Renewal.h" -#include "./Secure.h" -#include "./Skills/General.h" +#include "./renewal.h" +#include "./secure.h" +#include "./classes/general.h" + /** * Constants come last; so they process anything that could've been modified in early includes **/ -#include "./Data/Const.h" +#include "./const.h" #endif // _CONFIG_CORE_H_ diff --git a/src/map/config/Renewal.h b/src/map/config/renewal.h index 938c8b29a..938c8b29a 100644 --- a/src/map/config/Renewal.h +++ b/src/map/config/renewal.h diff --git a/src/map/config/Secure.h b/src/map/config/secure.h index e2b000440..e2b000440 100644 --- a/src/map/config/Secure.h +++ b/src/map/config/secure.h diff --git a/vcproj-10/map-server_sql.vcxproj b/vcproj-10/map-server_sql.vcxproj index e90c3c4de..ad546cada 100644 --- a/vcproj-10/map-server_sql.vcxproj +++ b/vcproj-10/map-server_sql.vcxproj @@ -182,13 +182,12 @@ <ClInclude Include="..\src\map\pc_groups.h" /> <ClInclude Include="..\src\map\pet.h" /> <ClInclude Include="..\src\map\quest.h" /> - <ClInclude Include="..\src\map\config\Core.h" /> - <ClInclude Include="..\src\map\config\Renewal.h" /> - <ClInclude Include="..\src\map\config\Secure.h" /> - <ClInclude Include="..\src\map\config\Data\Const.h" /> - <ClInclude Include="..\src\map\config\Skills\General.h" /> - <ClInclude Include="..\src\map\config\Skills\Mage_Classes.h" /> - <ClInclude Include="..\src\map\config\Skills\Swordsman_Classes.h" /> + <ClInclude Include="..\src\map\config\const.h" /> + <ClInclude Include="..\src\map\config\core.h" /> + <ClInclude Include="..\src\map\config\renewal.h" /> + <ClInclude Include="..\src\map\config\secure.h" /> + <ClInclude Include="..\src\map\config\classes\general.h" /> + <ClInclude Include="..\src\map\config\classes\swordsman.h" /> <ClInclude Include="..\src\map\script.h" /> <ClInclude Include="..\src\map\searchstore.h" /> <ClInclude Include="..\src\map\skill.h" /> diff --git a/vcproj-10/map-server_sql.vcxproj.filters b/vcproj-10/map-server_sql.vcxproj.filters index f5862c135..343c866c4 100644 --- a/vcproj-10/map-server_sql.vcxproj.filters +++ b/vcproj-10/map-server_sql.vcxproj.filters @@ -342,13 +342,12 @@ <ClInclude Include="..\src\common\utils.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\map\config\Core.h" /> - <ClInclude Include="..\src\map\config\Renewal.h" /> - <ClInclude Include="..\src\map\config\Secure.h" /> - <ClInclude Include="..\src\map\config\Data\Const.h" /> - <ClInclude Include="..\src\map\config\Skills\General.h" /> - <ClInclude Include="..\src\map\config\Skills\Mage_Classes.h" /> - <ClInclude Include="..\src\map\config\Skills\Swordsman_Classes.h" /> + <ClInclude Include="..\src\map\config\const.h" /> + <ClInclude Include="..\src\map\config\core.h" /> + <ClInclude Include="..\src\map\config\renewal.h" /> + <ClInclude Include="..\src\map\config\secure.h" /> + <ClInclude Include="..\src\map\config\classes\general.h" /> + <ClInclude Include="..\src\map\config\classes\swordsman.h" /> <ClInclude Include="..\src\common\conf.h"> <Filter>common</Filter> </ClInclude> diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj index 6fb497f09..7945f8846 100644 --- a/vcproj-9/map-server_sql.vcproj +++ b/vcproj-9/map-server_sql.vcproj @@ -496,11 +496,11 @@ > </File> <File - RelativePath="..\src\map\config\Data\Const.h" + RelativePath="..\src\map\config\const.h" > </File> <File - RelativePath="..\src\map\config\Core.h" + RelativePath="..\src\map\config\core.h" > </File> <File @@ -520,7 +520,7 @@ > </File> <File - RelativePath="..\src\map\config\Skills\General.h" + RelativePath="..\src\map\config\classes\general.h" > </File> <File @@ -572,10 +572,6 @@ > </File> <File - RelativePath="..\src\map\config\Skills\Mage_Classes.h" - > - </File> - <File RelativePath="..\src\map\mail.c" > </File> @@ -676,7 +672,7 @@ > </File> <File - RelativePath="..\src\map\config\Renewal.h" + RelativePath="..\src\map\config\renewal.h" > </File> <File @@ -696,7 +692,7 @@ > </File> <File - RelativePath="..\src\map\config\Secure.h" + RelativePath="..\src\map\config\secure.h" > </File> <File @@ -724,7 +720,7 @@ > </File> <File - RelativePath="..\src\map\config\Skills\Swordsman_Classes.h" + RelativePath="..\src\map\config\classes\swordsman.h" > </File> <File |